diff --git a/build/releaseBuild.yml b/build/releaseBuild.yml
index afffd77cbd..9bb207b208 100644
--- a/build/releaseBuild.yml
+++ b/build/releaseBuild.yml
@@ -30,34 +30,28 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core sdk 2.1.818'
+    displayName: 'Use .NET Core sdk 2.x'
     inputs:
-      version: 2.1.818
-      installationPath: 'c:\Program Files\dotnet'
-
-  - task: UseDotNet@2
-    displayName: 'Use .NET Core sdk 2.1.x'
-    inputs:
-      version: 2.1.x
+      version: 2.x
       installationPath: $(Agent.ToolsDirectory)/dotnet
 
   - task: UseDotNet@2
-    displayName: 'Use .Net Core SDK 6'
+    displayName: 'Use .NET Core sdk 6.x'
     inputs:
-      version: 6.0.x
+      version: 6.x
+      installationPath: $(Agent.ToolsDirectory)/dotnet
 
   - task: UseDotNet@2
-    displayName: 'Use .Net Core SDK 8'
+    displayName: 'Use .NET Core sdk 8.x'
     inputs:
-      includePreviewVersions: true
-      version: 8.0.x
-    condition: eq(variables['TargetNet8'], 'True')
+      version: 8.x
+      installationPath: $(Agent.ToolsDirectory)/dotnet
 
   - task: DotNetCoreCLI@2
-    displayName: 'dotnet --list-sdks '
+    displayName: 'dotnet --list-sdks'
     inputs:
       command: custom
-      custom: '--list-sdks '
+      custom: '--list-sdks'
 
   - task: CmdLine@1
     displayName: 'Run VerifyResourceUsage.pl'
@@ -67,7 +61,6 @@ jobs:
 
   - powershell: |
       regedit /s .\build\strongNameBypass.reg
-      regedit /s .\build\strongNameBypass2.reg
     displayName: 'Strong Name Bypass'
 
   - task: PowerShell@2
@@ -77,13 +70,6 @@ jobs:
       filePath: ./updateAssemblyInfo.ps1
       arguments: '-packageType $(BuildConfiguration)'
 
-  # - task: MSBuild@1
-  #   displayName: Build
-  #   inputs:
-  #     solution: wilson.sln
-  #     msbuildArchitecture: x64
-  #     msbuildArguments: '/r:True /p:Configuration=$(BuildConfiguration) /p:Platform="Any CPU" /verbosity:m /p:SourceLinkCreate=true /p:RunApiCompat=true'
-
   - task: DotNetCoreCLI@2
     displayName: Build
     inputs:
@@ -91,7 +77,6 @@ jobs:
       projects: 'wilson.sln'
       custom: 'msbuild'
       arguments: '/r:True /p:Configuration=$(BuildConfiguration) /p:Platform="Any CPU" /verbosity:m /p:SourceLinkCreate=true'
-#      arguments: '/r:True /p:Configuration=$(BuildConfiguration) /p:Platform="Any CPU" /verbosity:m /p:SourceLinkCreate=true /p:RunApiCompat=true'
 
   - task: PowerShell@2
     displayName: 'Run Tests'
@@ -148,7 +133,7 @@ jobs:
 
 
   #Sign Wilson 7x task group
-  - template: template-sign-wilson-7x.yaml
+  - template: template-sign-wilson.yaml
 
   - task: PowerShell@2
     displayName: Pack
diff --git a/build/strongNameBypass2.reg b/build/strongNameBypass2.reg
deleted file mode 100644
index 930b518bda..0000000000
Binary files a/build/strongNameBypass2.reg and /dev/null differ
diff --git a/build/template-sign-wilson-7x.yaml b/build/template-sign-wilson.yaml
similarity index 95%
rename from build/template-sign-wilson-7x.yaml
rename to build/template-sign-wilson.yaml
index 5dd5d298c6..5c4303dcbd 100644
--- a/build/template-sign-wilson-7x.yaml
+++ b/build/template-sign-wilson.yaml
@@ -1,4 +1,4 @@
-#template sign-wilson-7x
+#template sign-wilson
 
 parameters:
   BuildConfiguration: 'release'
@@ -18,4 +18,4 @@ steps:
   displayName: 'Verify Signing'
   inputs:
     scriptName: build/VerifySigning.ps1
-    arguments: '-buildType ${{ parameters.BuildConfiguration }}'
\ No newline at end of file
+    arguments: '-buildType ${{ parameters.BuildConfiguration }}'
diff --git a/buildConfiguration.xml b/buildConfiguration.xml
index 83cd80e1a4..4478382ce5 100644
--- a/buildConfiguration.xml
+++ b/buildConfiguration.xml
@@ -2,7 +2,7 @@
   <dotnetArchitecture>x64</dotnetArchitecture>
   <nugetVersion>3.5.0-rc-1285</nugetVersion>
   <runtimes>net461,netstandard2.0</runtimes>
-  <assemblyVersion>7.0.3</assemblyVersion>
+  <assemblyVersion>7.0.4</assemblyVersion>
   <nugetSuffix>preview</nugetSuffix>
   <projects>
     <src>