diff --git a/Pipelines/cli/devskim-cli-pr.yml b/Pipelines/cli/devskim-cli-pr.yml
index 1933d3f0..613cbe90 100644
--- a/Pipelines/cli/devskim-cli-pr.yml
+++ b/Pipelines/cli/devskim-cli-pr.yml
@@ -13,7 +13,7 @@ resources:
     - repository: templates
       type: git
       name: SecurityEngineering/OSS-Tools-Pipeline-Templates
-      ref: refs/tags/v1.0.8
+      ref: refs/branches/gfs/Net8
 
 stages:
 - stage: Test
@@ -21,15 +21,13 @@ stages:
   - template: dotnet-test-job.yml@templates
     parameters:
       jobName: 'dotnet_test_windows'
-      dotnetVersion: 7.0.x
-      dotnetVersionLTS: 6.0.x
+      dotnetVersions: ['6.0.x','7.0.x','8.0.x']
       vmImage: 'oss-tools-win2022_1es-managed'
       projectPath: 'DevSkim-DotNet/Microsoft.DevSkim.Tests/Microsoft.DevSkim.Tests.csproj'
   - template: dotnet-test-job.yml@templates
     parameters:
       jobName: 'dotnet_test_ubuntu'
-      dotnetVersion: 7.0.x
-      dotnetVersionLTS: 6.0.x
+      dotnetVersions: ['6.0.x','7.0.x','8.0.x']
       vmImage: 'ubuntu-22.04-image-base'
       projectPath: 'DevSkim-DotNet/Microsoft.DevSkim.Tests/Microsoft.DevSkim.Tests.csproj'
       
@@ -47,7 +45,7 @@ stages:
   - template: dotnet-publish-linux-mac-job.yml@templates
     parameters:
       buildConfiguration: 'Release'
-      dotnetVersion: '7.0.x'
+      dotnetVersion: '8.0.x'
       projectPath: 'DevSkim-DotNet/Microsoft.DevSkim.CLI/Microsoft.DevSkim.CLI.csproj'
       projectName: 'DevSkim_CLI'
       exePath: 'devskim'
@@ -56,7 +54,7 @@ stages:
   - template: dotnet-publish-win-netcore-job.yml@templates
     parameters:
       buildConfiguration: 'Release'
-      dotnetVersion: '7.0.x'
+      dotnetVersion: '8.0.x'
       projectPath: 'DevSkim-DotNet/Microsoft.DevSkim.CLI/Microsoft.DevSkim.CLI.csproj'
       projectName: 'DevSkim_CLI'
       preBuild:
@@ -65,7 +63,7 @@ stages:
     parameters:
       jobName: 'pack_lib'
       buildConfiguration: 'Release'
-      dotnetVersion: '7.0.x'
+      dotnetVersion: '8.0.x'
       projectPath: 'DevSkim-DotNet/Microsoft.DevSkim/Microsoft.DevSkim.csproj'
       projectName: 'DevSkim_Lib'
       preBuild:
@@ -74,7 +72,7 @@ stages:
     parameters:
       jobName: 'pack_cli'
       buildConfiguration: 'Release'
-      dotnetVersion: '7.0.x'
+      dotnetVersion: '8.0.x'
       projectPath: 'DevSkim-DotNet/Microsoft.DevSkim.CLI/Microsoft.DevSkim.CLI.csproj'
       projectName: 'DevSkim_CLI'
       preBuild: