diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml
index fce1e878399a9..695e8d7231968 100644
--- a/eng/pipelines/templates/jobs/ci.yml
+++ b/eng/pipelines/templates/jobs/ci.yml
@@ -57,9 +57,10 @@ jobs:
   - job: 'Build'
 
     variables:
-      - template: /eng/pipelines/templates/variables/globals.yml
-      - name: ArtifactName
-        value: 'packages'
+      ArtifactName: 'packages'
+      Codeql.Enabled: true
+      Codeql.BuildIdentifier: ${{ parameters.ServiceDirectory }}
+      Codeql.SkipTaskAutoInjection: false
 
     pool:
       name: azsdk-pool-mms-ubuntu-2004-general
@@ -222,9 +223,6 @@ jobs:
   - job: 'Analyze'
     condition: and(succeeded(), ne(variables['Skip.Analyze'], 'true'))
 
-    variables:
-      - template: /eng/pipelines/templates/variables/globals.yml
-
     pool:
       name: azsdk-pool-mms-ubuntu-2004-general
       vmImage: MMSUbuntu20.04
diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml
index c5f582cc70c7b..8fbcd33eb9a58 100644
--- a/eng/pipelines/templates/stages/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml
@@ -66,6 +66,9 @@ parameters:
   type: string
   default: not-specified
 
+variables:
+  - template: /eng/pipelines/templates/variables/globals.yml
+
 stages:
   - stage: Build
     jobs:
diff --git a/eng/pipelines/templates/variables/globals.yml b/eng/pipelines/templates/variables/globals.yml
index 44001e6497c92..110b9603e5058 100644
--- a/eng/pipelines/templates/variables/globals.yml
+++ b/eng/pipelines/templates/variables/globals.yml
@@ -44,3 +44,6 @@ variables:
   skipComponentGovernanceDetection: true
   DisableDockerDetector: true
   Package.EnableSBOMSigning: true
+
+  # Disable CodeQL injections except for where we specifically enable it
+  Codeql.SkipTaskAutoInjection: true