diff --git a/MIEngine.UnixPortSupplier.nuspec b/MIEngine.UnixPortSupplier.nuspec
index fae9ff2d3..be725dfcd 100644
--- a/MIEngine.UnixPortSupplier.nuspec
+++ b/MIEngine.UnixPortSupplier.nuspec
@@ -12,7 +12,7 @@
     <tags></tags>
   </metadata>
   <files>
-    <file src="drop\Release\ReferenceAssemblies\Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.xml" target="ref\dotnet" />
-    <file src="drop\Release\ReferenceAssemblies\Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.dll" target="ref\dotnet" />
+    <file src="ReferenceAssemblies\Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.xml" target="ref\dotnet" />
+    <file src="ReferenceAssemblies\Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.dll" target="ref\dotnet" />
   </files>
 </package>
diff --git a/MIEngine.mdd.nuspec b/MIEngine.mdd.nuspec
index 883cab2ad..051d4a5bf 100644
--- a/MIEngine.mdd.nuspec
+++ b/MIEngine.mdd.nuspec
@@ -12,10 +12,10 @@
     <tags></tags>
   </metadata>
   <files>
-    <file src="drop\Release\ReferenceAssemblies\*.xml" target="ref\dotnet" exclude="drop\Release\ReferenceAssemblies\Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.xml" />
-    <file src="drop\Release\ReferenceAssemblies\Microsoft.DebugEngineHost.dll" target="ref\dotnet" />
-    <file src="drop\Release\Microsoft.MICore.dll" target="ref\dotnet" />
-    <file src="drop\Release\*" target="Release" exclude="drop\Release\Install.cmd;drop\Release\ReferenceAssemblies" />
-    <file src="drop\Release\loc\**\*" target="Release\loc" />
+    <file src="ReferenceAssemblies\*.xml" target="ref\dotnet" exclude="ReferenceAssemblies\Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.xml" />
+    <file src="ReferenceAssemblies\Microsoft.DebugEngineHost.dll" target="ref\dotnet" />
+    <file src="Microsoft.MICore.dll" target="ref\dotnet" />
+    <file src="*" target="Release" exclude="Install.cmd;drop\Release\ReferenceAssemblies" />
+    <file src="loc\**\*" target="Release\loc" />
   </files>
 </package>
diff --git a/eng/pipelines/steps/PackAndPublishVSPackages.yml b/eng/pipelines/steps/PackAndPublishVSPackages.yml
deleted file mode 100644
index fd95d189e..000000000
--- a/eng/pipelines/steps/PackAndPublishVSPackages.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Pack and Publish NuGet Packages for VS
-# Creates:
-#    - VS.Redist.Debugger.MDD.MIEngine
-#    - VS.Redist.Debugger.MDD.UnixPortSupplier
----
-parameters:
-  BasePath: $(Build.StagingDirectory)
-
-steps:
-- script: |
-    for /f "delims=" %%f in ($(Build.SourcesDirectory)\obj\Lab.Release\NugetPackageVersion.txt) do set NugetPackageVersion=%%f
-    echo ##vso[task.setvariable variable=NugetPackageVersion;]%NugetPackageVersion%
-  displayName: 'Get NuGet Version'
-
-- template: ../tasks/1ES/PublishPipelineArtifact.yml
-  parameters:
-    displayName: 'Publish File Version'
-    targetPath: '$(Build.SourcesDirectory)\obj\Lab.Release\NugetPackageVersion.txt'
-    artifactName: 'PackageVersion'
-    OneESPT: true
-
-- template: ../tasks/NuGetCommand.yml
-  parameters:
-    displayName: 'NuGet pack'
-    command: pack
-    searchPatternPack: '$(Build.SourcesDirectory)\MIEngine.mdd.nuspec;$(Build.SourcesDirectory)\MIEngine.UnixPortSupplier.nuspec'
-    configurationToPack: Release
-    buildProperties: 'version=$(NugetPackageVersion)'
-    basePath: ${{ parameters.BasePath }}
-
-- task: 1ES.PublishNuget@1
-  displayName: Publish Nuget package
-  condition: and(succeeded(), eq(variables['SignType'], 'real'))
-  inputs:
-    packagesToPush: '$(Build.SourcesDirectory)\VS.Redist.Debugger.MDD.MIEngine.*.nupkg;$(Build.SourcesDirectory)\VS.Redist.Debugger.MDD.UnixPortSupplier.*.nupkg'
-    packageParentPath: '$(Build.SourcesDirectory)'
-    publishVstsFeed: '97a41293-2972-4f48-8c0e-05493ae82010' # VS
-    nuGetFeedType: internal
-...
\ No newline at end of file
diff --git a/eng/pipelines/steps/PublishVSPackages.yml b/eng/pipelines/steps/PublishVSPackages.yml
new file mode 100644
index 000000000..33ec76358
--- /dev/null
+++ b/eng/pipelines/steps/PublishVSPackages.yml
@@ -0,0 +1,18 @@
+# Pack and Publish NuGet Packages for VS
+# Creates:
+#    - VS.Redist.Debugger.MDD.MIEngine
+#    - VS.Redist.Debugger.MDD.UnixPortSupplier
+---
+parameters:
+  BasePath: $(Build.StagingDirectory)
+
+steps:
+- task: 1ES.PublishNuget@1
+  displayName: Publish Nuget package
+  condition: and(succeeded(), eq(variables['SignType'], 'real'))
+  inputs:
+    packagesToPush: '$(Build.SourcesDirectory)\VS.Redist.Debugger.MDD.MIEngine.*.nupkg;$(Build.SourcesDirectory)\VS.Redist.Debugger.MDD.UnixPortSupplier.*.nupkg'
+    packageParentPath: '$(Build.SourcesDirectory)'
+    publishVstsFeed: '97a41293-2972-4f48-8c0e-05493ae82010' # VS
+    nuGetFeedType: internal
+...
\ No newline at end of file
diff --git a/eng/pipelines/templates/VS-release.template.yml b/eng/pipelines/templates/VS-release.template.yml
index 352fa49ae..9a5b1b972 100644
--- a/eng/pipelines/templates/VS-release.template.yml
+++ b/eng/pipelines/templates/VS-release.template.yml
@@ -6,9 +6,12 @@ steps:
 
 - template: ../tasks/NuGetToolInstaller.yml
 
+- template: ../tasks/MicroBuildSigningPlugin.yml
+
 - template: ../steps/BuildSolution.yml
   parameters:
     Configuration: 'Lab.Release'
+    BuildArguments: /p:NuGetPath=$(NuGetExeToolPath) /p:NuGetPrerelease=false
     OneESPT: true
 
 - template: ../steps/CollectAndPublishBinaries.yml
@@ -25,7 +28,7 @@ steps:
   parameters:
     OneESPT: true
 
-- template: ../steps/PackAndPublishVSPackages.yml
+- template: ../steps/PublishVSPackages.yml
   parameters:
     BasePath: $(Build.StagingDirectory)
 
diff --git a/src/MIDebugPackage/MIDebugPackage.csproj b/src/MIDebugPackage/MIDebugPackage.csproj
index c07e0a335..8e136cb13 100755
--- a/src/MIDebugPackage/MIDebugPackage.csproj
+++ b/src/MIDebugPackage/MIDebugPackage.csproj
@@ -221,6 +221,11 @@
     </ProjectReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageNuspec Include="$(MIEngineRoot)\MIEngine.mdd.nuspec" />
+    <NugetPackages Include="VS.Redist.Debugger.MDD.MIEngine" />
+  </ItemGroup>
+
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="Exists('$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets') AND '$(MSBuildRuntimeType)' != 'Core'" />
 
diff --git a/src/SSHDebugPS/SSHDebugPS.csproj b/src/SSHDebugPS/SSHDebugPS.csproj
index dd99dd6e1..df00c43df 100644
--- a/src/SSHDebugPS/SSHDebugPS.csproj
+++ b/src/SSHDebugPS/SSHDebugPS.csproj
@@ -90,6 +90,11 @@
     </ProjectReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageNuspec Include="$(MIEngineRoot)\MIEngine.UnixPortSupplier.nuspec" />
+    <NugetPackages Include="VS.Redist.Debugger.MDD.UnixPortSupplier" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="StringResources.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -104,4 +109,5 @@
   </ItemGroup>
   <Import Project="..\..\build\miengine.targets" />
   <Import Project="..\..\build\miengine.csharp.localization.targets" />
+  <Import Project="..\..\build\DropFiles.targets" />
 </Project>
\ No newline at end of file