diff --git a/eng/ci/official-build.yml b/eng/ci/official-build.yml
index 776d587e..bdb9893f 100644
--- a/eng/ci/official-build.yml
+++ b/eng/ci/official-build.yml
@@ -30,6 +30,12 @@ resources:
 variables:
   - template: ci/variables/build.yml@eng
   - template: ci/variables/cfs.yml@eng
+  - name: codeql.language
+    value: java,powershell
+  - name: codeql.buildIdentifier
+    value: java_worker_official
+  - name: codeql.excludePathPatterns
+    value: extract/inst
 
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1es
@@ -41,35 +47,16 @@ extends:
 
     stages:
       - stage: Build
-        templateContext:
-          sdl:
-            codeql:
-              language: java,powershell
-              runSourceLanguagesInSourceAnalysis: true
-              buildIdentifier: java_worker_official
-              excludePathPatterns: '/extract/inst'
         jobs:
           - template: /eng/ci/templates/official/jobs/build-artifacts.yml@self
 
       - stage: TestWindows
         dependsOn: Build
-        templateContext:
-          sdl:
-            codeql:
-              language: csharp
-              buildIdentifier: java_worker_csharp_official
-              excludePathPatterns: '/extract/inst'
         jobs:
           - template: /eng/ci/templates/official/jobs/run-e2e-tests-windows.yml@self
 
       - stage: TestLinux
         dependsOn:
           - TestWindows
-        templateContext:
-          sdl:
-            codeql:
-              compiled:
-                enabled: false
-                justificationForDisabling: 'Running the scan in TestWindows stage'
         jobs:
           - template: /eng/ci/templates/official/jobs/run-e2e-tests-linux.yml@self
diff --git a/eng/ci/public-build.yml b/eng/ci/public-build.yml
index 6d695643..cea62eba 100644
--- a/eng/ci/public-build.yml
+++ b/eng/ci/public-build.yml
@@ -24,6 +24,14 @@ resources:
       name: 1ESPipelineTemplates/1ESPipelineTemplates
       ref: refs/tags/release
 
+variables:
+  - name: codeql.language
+    value: java,powershell
+  - name: codeql.buildIdentifier
+    value: java_worker_public
+  - name: codeql.excludePathPatterns
+    value: extract/inst
+
 extends:
   template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
   parameters:
@@ -38,35 +46,16 @@ extends:
 
     stages:
       - stage: Build
-        templateContext:
-          sdl:
-            codeql:
-              language: java,powershell
-              buildIdentifier: java_worker_public
-              excludePathPatterns: '/extract/inst'
-              runSourceLanguagesInSourceAnalysis: true
         jobs:
           - template: /eng/ci/templates/jobs/build.yml@self
 
       - stage: TestWindows
         dependsOn: Build
-        templateContext:
-          sdl:
-            codeql:
-              language: csharp
-              buildIdentifier: java_worker_csharp_public
-              excludePathPatterns: '/extract/inst'
         jobs:
           - template: /eng/ci/templates/jobs/run-emulated-tests-windows.yml@self
 
       - stage: TestLinux
         dependsOn:
           - TestWindows
-        templateContext:
-          sdl:
-            codeql:
-              compiled:
-                enabled: false
-                justificationForDisabling: 'Running the scan in TestWindows stage'
         jobs:
           - template: /eng/ci/templates/jobs/run-emulated-tests-linux.yml@self