diff --git a/env_gen.md b/env_gen.md
index 9c0f816b7c..a03f96604e 100644
--- a/env_gen.md
+++ b/env_gen.md
@@ -154,6 +154,7 @@
  | HELM_PIPELINE_STATUS_CHECK_ELIGIBLE_TIME | 120 |  | 
  | HIDE_IMAGE_TAGGING_HARD_DELETE | false |  | 
  | IGNORE_AUTOCOMPLETE_AUTH_CHECK | false |  | 
+ | IGNORE_CM_CS_IN_CI_JOB | false |  | 
  | IMAGE_RETRY_COUNT | 0 |  | 
  | IMAGE_RETRY_INTERVAL | 5 |  | 
  | IMAGE_SCANNER_ENDPOINT | http://image-scanner-new-demo-devtroncd-service.devtroncd:80 |  | 
diff --git a/pkg/pipeline/CiService.go b/pkg/pipeline/CiService.go
index 67e78ab1ad..50072ac93c 100644
--- a/pkg/pipeline/CiService.go
+++ b/pkg/pipeline/CiService.go
@@ -195,6 +195,12 @@ func (impl *CiServiceImpl) TriggerCiPipeline(trigger types.Trigger) (int, error)
 	if ciWorkflowConfig.Namespace == "" {
 		ciWorkflowConfig.Namespace = impl.config.GetDefaultNamespace()
 	}
+	if scope.SystemMetadata == nil {
+		scope.SystemMetadata = &resourceQualifiers.SystemMetadata{
+			Namespace: ciWorkflowConfig.Namespace,
+			AppName:   pipeline.App.AppName,
+		}
+	}
 
 	// preCiSteps, postCiSteps, refPluginsData, err := impl.pipelineStageService.BuildPrePostAndRefPluginStepsDataForWfRequest(pipeline.Id, ciEvent)
 	prePostAndRefPluginResponse, err := impl.pipelineStageService.BuildPrePostAndRefPluginStepsDataForWfRequest(pipeline.Id, pipelineConfigBean.CiStage, scope)
@@ -248,6 +254,7 @@ func (impl *CiServiceImpl) TriggerCiPipeline(trigger types.Trigger) (int, error)
 		workflowRequest.Type = pipelineConfigBean.CI_WORKFLOW_PIPELINE_TYPE
 	}
 
+	workflowRequest.CiPipelineType = trigger.PipelineType
 	err = impl.executeCiPipeline(workflowRequest)
 	if err != nil {
 		impl.Logger.Errorw("workflow error", "err", err)
diff --git a/pkg/pipeline/WorkflowService.go b/pkg/pipeline/WorkflowService.go
index 9b648dee1a..26b2935720 100644
--- a/pkg/pipeline/WorkflowService.go
+++ b/pkg/pipeline/WorkflowService.go
@@ -30,6 +30,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/infraConfig"
 	k8s2 "github.com/devtron-labs/devtron/pkg/k8s"
 	bean3 "github.com/devtron-labs/devtron/pkg/pipeline/bean"
+	"github.com/devtron-labs/devtron/pkg/pipeline/bean/CiPipeline"
 	"github.com/devtron-labs/devtron/pkg/pipeline/executors"
 	"github.com/devtron-labs/devtron/pkg/pipeline/infraProviders"
 	"github.com/devtron-labs/devtron/pkg/pipeline/types"
@@ -126,10 +127,14 @@ func (impl *WorkflowServiceImpl) createWorkflowTemplate(workflowRequest *types.W
 		impl.Logger.Errorw("error occurred while appending CmCs", "err", err)
 		return bean3.WorkflowTemplate{}, err
 	}
-	workflowConfigMaps, workflowSecrets, err = impl.addExistingCmCsInWorkflow(workflowRequest, workflowConfigMaps, workflowSecrets)
-	if err != nil {
-		impl.Logger.Errorw("error occurred while adding existing CmCs", "err", err)
-		return bean3.WorkflowTemplate{}, err
+
+	shouldAddExistingCmCsInWorkflow := impl.shouldAddExistingCmCsInWorkflow(workflowRequest)
+	if shouldAddExistingCmCsInWorkflow {
+		workflowConfigMaps, workflowSecrets, err = impl.addExistingCmCsInWorkflow(workflowRequest, workflowConfigMaps, workflowSecrets)
+		if err != nil {
+			impl.Logger.Errorw("error occurred while adding existing CmCs", "err", err)
+			return bean3.WorkflowTemplate{}, err
+		}
 	}
 
 	workflowTemplate.ConfigMaps = workflowConfigMaps
@@ -176,6 +181,14 @@ func (impl *WorkflowServiceImpl) createWorkflowTemplate(workflowRequest *types.W
 	return workflowTemplate, nil
 }
 
+func (impl *WorkflowServiceImpl) shouldAddExistingCmCsInWorkflow(workflowRequest *types.WorkflowRequest) bool {
+	// CmCs are not added for CI_JOB if IgnoreCmCsInCiJob is true
+	if workflowRequest.CiPipelineType == string(CiPipeline.CI_JOB) && impl.ciCdConfig.IgnoreCmCsInCiJob {
+		return false
+	}
+	return true
+}
+
 func (impl *WorkflowServiceImpl) getClusterConfig(workflowRequest *types.WorkflowRequest) (*rest.Config, error) {
 	env := workflowRequest.Env
 	if workflowRequest.IsExtRun {
diff --git a/pkg/pipeline/types/CiCdConfig.go b/pkg/pipeline/types/CiCdConfig.go
index 5619a0527f..bf7e82fe3e 100644
--- a/pkg/pipeline/types/CiCdConfig.go
+++ b/pkg/pipeline/types/CiCdConfig.go
@@ -81,6 +81,7 @@ type CiCdConfig struct {
 	ImageScanMaxRetries              int                                 `env:"IMAGE_SCAN_MAX_RETRIES" envDefault:"3"`
 	ImageScanRetryDelay              int                                 `env:"IMAGE_SCAN_RETRY_DELAY" envDefault:"5"`
 	ShowDockerBuildCmdInLogs         bool                                `env:"SHOW_DOCKER_BUILD_ARGS" envDefault:"true"`
+	IgnoreCmCsInCiJob                bool                                `env:"IGNORE_CM_CS_IN_CI_JOB" envDefault:"false"`
 	// from CdConfig
 	CdLimitCpu                       string                              `env:"CD_LIMIT_CI_CPU" envDefault:"0.5"`
 	CdLimitMem                       string                              `env:"CD_LIMIT_CI_MEM" envDefault:"3G"`