diff --git a/.azure/pipelines/build.yaml b/.azure/pipelines/build.yaml
index 0f6a55e29..3d25dfa92 100644
--- a/.azure/pipelines/build.yaml
+++ b/.azure/pipelines/build.yaml
@@ -23,10 +23,6 @@ parameters:
     values:
     - Release
     - Debug
-  - name: version_prefix
-    displayName: Version prefix
-    type: string
-    default: 8.0.0
   - name: include_suffix
     displayName: Append version suffix
     type: boolean
@@ -47,6 +43,10 @@ parameters:
     displayName: Publish to nuget.org
     type: boolean
     default: false
+  - name: publish_nightly
+    displayName: Publish to autogen-nightly
+    type: boolean
+    default: false
   - name: runCodeQL3000
     default: false
     displayName: Run CodeQL3000 tasks
@@ -81,11 +81,10 @@ extends:
       - template: /.azure/pipelines/templates/build.yaml@self
         parameters:
           build_configuration: ${{ parameters.build_configuration }}
-          version_prefix: ${{ parameters.version_prefix }}
           include_suffix: ${{ parameters.include_suffix }}
           version_suffix: ${{ parameters.version_suffix }}
           codesign: ${{ parameters.codesign }}
           skip_test: ${{ parameters.skip_test }}
-          publish_nightly: false
+          publish_nightly: ${{ parameters.publish_nightly }}
           publish_nuget: ${{ parameters.publish_nuget }}
           runCodeQL3000: ${{ parameters.runCodeQL3000 }}
\ No newline at end of file
diff --git a/.azure/pipelines/templates/build.yaml b/.azure/pipelines/templates/build.yaml
index 47714e137..7e3d82f4d 100644
--- a/.azure/pipelines/templates/build.yaml
+++ b/.azure/pipelines/templates/build.yaml
@@ -6,10 +6,6 @@ parameters:
     values:
     - Release
     - Debug
-  - name: version_prefix
-    displayName: Version prefix
-    type: string
-    default: 8.0.0
   - name: include_suffix
     displayName: Append version suffix
     type: boolean
@@ -45,18 +41,11 @@ jobs:
 - job: Build
   displayName: Build and create NuGet packages
   variables:
+    publishVstsFeed: 'AGPublic/AutoGen-Nightly'
     ${{ if eq(parameters.codesign, true) }}:
-      ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-        esrp_signing: false
-        microbuild_signing: true
-        publishVstsFeed: 'public/orleans-nightly'
-      ${{ else }}:
-        esrp_signing: true
-        microbuild_signing: false
-        publishVstsFeed: 'orleans-public/orleans-nightly'
+      esrp_signing: true
     ${{ else }}:
       esrp_signing: false
-      microbuild_signing: false
   ${{ if ne(variables['System.TeamProject'], 'GitHub - PR Builds') }}:
     templateContext:
       outputs:
@@ -64,11 +53,11 @@ jobs:
         targetPath: '$(build.sourcesdirectory)/dotnet/artifacts'
         artifactName: artifacts folder
       # Publish packages to nightly
-      - ${{ if and(eq(parameters.codesign, true), eq(parameters.publish_nightly, true)) }}:
+      - ${{ if eq(parameters.publish_nightly, true) }}: # TODO add eq(parameters.codesign, true)
         - output: nuget
           useDotNetTask: false
           packageParentPath: $(Pipeline.Workspace)
-          packagesToPush: $(build.sourcesdirectory)/artifacts/${{parameters.build_configuration}}/**/*.nupkg
+          packagesToPush: $(build.sourcesdirectory)/dotnet/artifacts/**/*.nupkg;$(build.sourcesdirectory)/dotnet/artifacts/**/*.snupkg
           nuGetFeedType: internal
           publishVstsFeed: $(publishVstsFeed)
           allowPackageConflicts: true
@@ -77,22 +66,12 @@ jobs:
           condition: succeeded()
           useDotNetTask: false
           packageParentPath: $(Pipeline.Workspace)
-          packagesToPush: $(build.sourcesdirectory)/Artifacts/${{parameters.build_configuration}}/**/*.nupkg
+          packagesToPush: $(build.sourcesdirectory)/dotnet/artifacts/**/*.nupkg;$(build.sourcesdirectory)/dotnet/artifacts/**/*.snupkg
           nuGetFeedType: external
           publishFeedCredentials: dotnet-orleans-nuget
           publishPackageMetadata: true
           allowPackageConflicts: true
   steps:
-  - ${{ if eq(variables.microbuild_signing, true) }}:
-    - task: MicroBuildSigningPlugin@4
-      displayName: Install MicroBuild plugin
-      inputs:
-        signType: real
-        zipSources: false
-        feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
-      env:
-        TeamName: AutoGen
-        MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
   - checkout: self
   - task: UseDotNet@2
     displayName: 'Use .NET Core sdk'
@@ -121,10 +100,10 @@ jobs:
       arguments: '$(build_flags) /bl:${{parameters.build_configuration}}-Build.binlog /p:Configuration=${{parameters.build_configuration}} $(solution)'
       workingDirectory: $(Build.SourcesDirectory)/dotnet
     env:
-      VersionPrefix: ${{parameters.version_prefix}}
-      ${{ if eq(parameters.include_suffix, true) }}:
+      ${{ if and(eq(parameters.include_suffix, true), eq(parameters.publish_nuget, false)) }}:
         VersionSuffix: ${{parameters.version_suffix}}
       OfficialBuild: $(official_build)
+
   - ${{ if eq(variables.runCodeQL3000, 'true') }}:
     - task: CodeQL3000Finalize@0
       displayName: CodeQL Finalize
@@ -205,8 +184,7 @@ jobs:
       script: 'dotnet pack --no-build --no-restore $(build_flags) /bl:${{parameters.build_configuration}}-Pack.binlog /p:Configuration=${{parameters.build_configuration}} $(solution)'
       workingDirectory: $(Build.SourcesDirectory)/dotnet
     env:
-      VersionPrefix: ${{parameters.version_prefix}}
-      ${{ if eq(parameters.include_suffix, true) }}:
+      ${{ if and(eq(parameters.include_suffix, true), eq(parameters.publish_nuget, false)) }}:
         VersionSuffix: ${{parameters.version_suffix}}
       OfficialBuild: $(official_build)
   # NuGet code signing