diff --git a/eng/ci/official-build.yml b/eng/ci/official-build.yml
index 12e6f64e..5cc50cf2 100644
--- a/eng/ci/official-build.yml
+++ b/eng/ci/official-build.yml
@@ -1,31 +1,31 @@
 schedules:
-- cron: "0 20 * * *"
-  displayName: Nightly Build
-  branches:
-    include:
-      - dev
-  always: true
+  - cron: '0 20 * * *'
+    displayName: Nightly Build
+    branches:
+      include:
+        - dev
+    always: true
 
 trigger:
   batch: true
   branches:
     include:
-    - dev
-    - release/* # azure-functions-java-worker github repo restricts creation of release/* branches, so using a pattern is safe here.
+      - dev
+      - release/* # azure-functions-java-worker github repo restricts creation of release/* branches, so using a pattern is safe here.
 
 # CI only, does not trigger on PRs.
 pr: none
 
 resources:
   repositories:
-  - repository: 1es
-    type: git
-    name: 1ESPipelineTemplates/1ESPipelineTemplates
-    ref: refs/tags/release
-  - repository: eng
-    type: git
-    name: engineering
-    ref: refs/tags/release
+    - repository: 1es
+      type: git
+      name: 1ESPipelineTemplates/1ESPipelineTemplates
+      ref: refs/tags/release
+    - repository: eng
+      type: git
+      name: engineering
+      ref: refs/tags/release
 
 variables:
   - template: ci/variables/build.yml@eng
@@ -40,20 +40,24 @@ extends:
       os: windows
 
     stages:
-    - stage: Build
-
-      jobs:
-      - template: /eng/ci/templates/official/jobs/build-artifacts.yml@self
-
-    - stage: TestWindows
-      dependsOn: Build
-
-      jobs:
-      - template: /eng/ci/templates/official/jobs/run-e2e-tests-windows.yml@self
-
-    - stage: TestLinux
-      dependsOn:
-      - TestWindows
-
-      jobs:
-      - template: /eng/ci/templates/official/jobs/run-e2e-tests-linux.yml@self
+      - stage: Build
+        variables:
+          Codeql.Language: java,powershell
+          Codeql.RunSourceLanguagesInSourceAnalysis: true
+        jobs:
+          - template: /eng/ci/templates/official/jobs/build-artifacts.yml@self
+
+      - stage: TestWindows
+        dependsOn: Build
+        variables:
+          Codeql.Language: csharp
+        jobs:
+          - template: /eng/ci/templates/official/jobs/run-e2e-tests-windows.yml@self
+
+      - stage: TestLinux
+        dependsOn:
+          - TestWindows
+        variables:
+          Codeql.Enabled: false
+        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 b12724d3..88073c66 100644
--- a/eng/ci/public-build.yml
+++ b/eng/ci/public-build.yml
@@ -1,28 +1,28 @@
 schedules:
-- cron: "0 0 * * *"
-  displayName: Nightly Build
-  branches:
-    include:
-      - dev
-  always: true
+  - cron: '0 0 * * *'
+    displayName: Nightly Build
+    branches:
+      include:
+        - dev
+    always: true
 
 trigger:
   batch: true
   branches:
     include:
-    - dev
+      - dev
 
 pr:
   branches:
     include:
-    - dev
+      - dev
 
 resources:
   repositories:
-  - repository: 1es
-    type: git
-    name: 1ESPipelineTemplates/1ESPipelineTemplates
-    ref: refs/tags/release
+    - repository: 1es
+      type: git
+      name: 1ESPipelineTemplates/1ESPipelineTemplates
+      ref: refs/tags/release
 
 extends:
   template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
@@ -34,24 +34,33 @@ extends:
 
     sdl:
       codeql:
-         compiled:
-           enabled: true
-         runSourceLanguagesInSourceAnalysis: true
-
-    stages:
-    - stage: Build
+        compiled:
+          enabled: true
+        runSourceLanguagesInSourceAnalysis: true
 
-      jobs:
-      - template: /eng/ci/templates/jobs/build.yml@self
-    - stage: TestWindows
-      dependsOn: Build
+    settings:
+      # PR's from forks do not have sufficient permissions to set tags.
+      skipBuildTagsForGitHubPullRequests: ${{ variables['System.PullRequest.IsFork'] }}
 
-      jobs:
-      - template: /eng/ci/templates/jobs/run-emulated-tests-windows.yml@self
+    stages:
+      - stage: Build
+        variables:
+          Codeql.Language: java,powershell
+          Codeql.RunSourceLanguagesInSourceAnalysis: true
+        jobs:
+          - template: /eng/ci/templates/jobs/build.yml@self
 
-    - stage: TestLinux
-      dependsOn:
-      - TestWindows
+      - stage: TestWindows
+        dependsOn: Build
+        variables:
+          Codeql.Language: csharp
+        jobs:
+          - template: /eng/ci/templates/jobs/run-emulated-tests-windows.yml@self
 
-      jobs:
-      - template: /eng/ci/templates/jobs/run-emulated-tests-linux.yml@self
+      - stage: TestLinux
+        dependsOn:
+          - TestWindows
+        variables:
+          Codeql.Enabled: false
+        jobs:
+          - template: /eng/ci/templates/jobs/run-emulated-tests-linux.yml@self