diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ea024fce..1931e068 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -56,11 +56,11 @@ jobs:
           command: 'restore'
           projects: 'src/ExchangeSharp/ExchangeSharp.csproj'
       - task: DotNetCoreCLI@2
-        displayName: 'Build lib+console'
+        displayName: 'Build'
         inputs:
           command: 'build'
           projects: 'src/ExchangeSharp/ExchangeSharp.csproj'
-          arguments: '--configuration $(BuildConfiguration) --version-suffix prerelease-$(PipelineDate) --output $(Build.ArtifactStagingDirectory)'
+          arguments: '--configuration $(BuildConfiguration)'
       #- task: DotNetCoreCLI@2
       #  displayName: 'Tests'
       #  inputs:
@@ -69,21 +69,21 @@ jobs:
       #    projects: 'tests/*/*.csproj'
       #    publishTestResults: true
       #    testRunTitle: 'All tests'
-      #- task: DotNetCoreCLI@2
-      #  displayName: 'NuGet Pack'
-      #  inputs:
-      #    command: pack
-      #    packagesToPack: 'src/ExchangeSharp/ExchangeSharp.csproj'
-      #    packDestination: '$(Build.ArtifactStagingDirectory)'
-      #    versioningScheme: off
-      - task: NuGetToolInstaller@1
+      - task: DotNetCoreCLI@2
+        displayName: 'NuGet Pack'
+        inputs:
+          command: pack
+          packagesToPack: 'src/ExchangeSharp/ExchangeSharp.csproj'
+          outputDir: '$(Build.ArtifactStagingDirectory)'
+          arguments: '--configuration $(BuildConfiguration) --version-suffix prerelease-$(PipelineDate) --no-build'
       - task: NuGetAuthenticate@0
         displayName: 'NuGet Authenticate'
-      - task: NuGetCommand@2
+      - task: DotNetCoreCLI@2
         displayName: 'NuGet push'
         inputs:
           command: push
           packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg'
+          nuGetFeedType: internal
           publishVstsFeed: DigitalRuby/DigitalRuby
   - job: build_tag
     displayName: Build console app