diff --git a/Source/Addins/MonoDevelop.GtkSharp.Addin/MonoDevelop.GtkSharp.Addin.csproj b/Source/Addins/MonoDevelop.GtkSharp.Addin/MonoDevelop.GtkSharp.Addin.csproj
index d40329dd2..de1b8a3d8 100644
--- a/Source/Addins/MonoDevelop.GtkSharp.Addin/MonoDevelop.GtkSharp.Addin.csproj
+++ b/Source/Addins/MonoDevelop.GtkSharp.Addin/MonoDevelop.GtkSharp.Addin.csproj
@@ -55,9 +55,6 @@
     <Content Include="Templates\GtkSharp.Template.CSharp.nupkg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Templates\GtkSharp.Template.VBNet.nupkg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Templates\GtkSharp.Template.FSharp.nupkg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index daeefe37e..092cc8c1f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -16,6 +16,9 @@ steps:
   - script: echo "##vso[build.updatebuildnumber]$(version)"
     displayName: 'Set Build Number'
 
+  - script: sudo apt install -y monodevelop
+    displayName: 'Install MonoDevelop'
+
   - script: ./build.sh --BuildTarget=FullBuild --BuildVersion=$(version)
     displayName: 'CAKE Script'
 
@@ -40,6 +43,13 @@ steps:
       artifactName: Samples
       publishLocation: container
 
+  - task: PublishBuildArtifacts@1
+    displayName: Publish MonoDevelop Addin
+    inputs:
+      pathtoPublish: BuildOutput/Addins/MonoDevelop/MonoDevelop.GtkSharp.Addin_$(version).mpack
+      artifactName: MonoDevelop Addin
+      publishLocation: container
+
   - task: DotNetCoreCLI@2
     displayName: Publish to MyGet
     condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/develop'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
diff --git a/build.cake b/build.cake
index 0f316da30..a894faa9b 100644
--- a/build.cake
+++ b/build.cake
@@ -160,12 +160,9 @@ Task("PackageAddin")
         Configuration = configuration,
     };
     msbuildsettings = msbuildsettings.WithProperty("Version", Settings.Version);
-    msbuildsettings = msbuildsettings.WithProperty("MDBinDir", "/opt/MonoDevelop/bin/");
     msbuildsettings = msbuildsettings.WithTarget("PackageAddin");
 
-    // We need monodevelop on the build system to build the addin
-    // lets wait for its packaging to be finished.
-    // MSBuild("Source/Addins/MonoDevelop.GtkSharp.Addin/MonoDevelop.GtkSharp.Addin.sln", msbuildsettings);
+    MSBuild("Source/Addins/MonoDevelop.GtkSharp.Addin/MonoDevelop.GtkSharp.Addin.sln", msbuildsettings);
 });
 
 // TASK TARGETS