diff --git a/README.md b/README.md
index efe37a7..15c54af 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 SystemTrayMenu<img src="https://raw.githubusercontent.com/Hofknecht/SystemTrayMenu/master/Resources/SystemTrayMenu.ico" alt="Trulli" width="24" height="24">  
 ------------------
-[![Build Status](https://dev.azure.com/MarkusHofknecht/SystemTrayMenu/_apis/build/status/Hofknecht.SystemTrayMenu?branchName=master)](https://dev.azure.com/MarkusHofknecht/SystemTrayMenu/_build/latest?definitionId=2&branchName=master)
+[![Build Status](https://dev.azure.com/MarkusHofknecht/SystemTrayMenu/_apis/build/status/Hofknecht.SystemTrayMenu?branchName=master)](https://dev.azure.com/MarkusHofknecht/SystemTrayMenu/_build)
 [![All Releases](https://img.shields.io/github/downloads/Hofknecht/SystemTrayMenu/total.svg)](https://github.com/Hofknecht/SystemTrayMenu/releases)
 
 SystemTrayMenu is an improved open source toolbar for Windows.  
diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml
deleted file mode 100644
index 643ef20..0000000
--- a/azure-pipelines-release.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-# .NET Desktop
-# Build and run tests for .NET Desktop or Windows classic desktop solutions.
-# Add steps that publish symbols, save build artifacts, and more:
-# https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net
-
-trigger:
-- master
-
-pool:
-  vmImage: 'windows-latest'
-
-variables:
-  solution: '**/*.sln'
-  buildPlatform: 'Any CPU'
-  buildConfiguration: 'Release'
-
-steps:
-- task: NuGetToolInstaller@1
-
-- task: NuGetCommand@2
-  inputs:
-    restoreSolution: '$(solution)'
-
-- task: VSBuild@1
-  inputs:
-    solution: '$(solution)'
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
-
-- task: VSTest@2
-  inputs:
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
-
-- task: ArchiveFiles@2
-  inputs:
-    rootFolderOrFile: '$(Build.BinariesDirectory)'
-    includeRootFolder: true
-    archiveType: 'zip'
-    archiveFile: '$(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip'
-    replaceExistingArchive: true
-
-- task: GitHubRelease@1
-  inputs:
-    gitHubConnection: Hofknecht
-    repositoryName: '$(Build.Repository.Name)'
-    action: 'create'
-    target: '$(Build.SourceVersion)'
-    tagSource: 'gitTag'
-    title: 'SystemTrayMenu'
-    changeLogCompareToRelease: 'lastFullRelease'
-    changeLogType: 'issueBased'
-    changeLogLabels: '[{ "label" : "Release", "displayName" : "Release", "state" : "closed" }]'
-    assets: |
-      $(Build.ArtifactStagingDirectory)/*.zip
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6a9684e..5fc9853 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -3,11 +3,17 @@
 # Add steps that publish symbols, save build artifacts, and more:
 # https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net
 
+
 trigger:
-- master
+  batch: true
+  branches:
+    include:
+    - 'develop'
+    exclude:
+    - 'release/1*'
 
 pool:
-  vmImage: 'windows-latest'
+  vmImage: 'Windows-2019'
 
 variables:
   solution: '**/*.sln'
@@ -17,17 +23,57 @@ variables:
 steps:
 - task: NuGetToolInstaller@1
 
+- task: UseDotNet@2
+  displayName: 'Use .NET Core sdk 3.1.2'
+  inputs:
+    packageType: sdk
+    version: 3.1.102
+
 - task: NuGetCommand@2
+  displayName: NuGet restore
   inputs:
     restoreSolution: '$(solution)'
+    feedsToUse: config
 
-- task: VSBuild@1
+- task: DotNetCoreCLI@2
+  displayName: Publish single-exe x64
   inputs:
-    solution: '$(solution)'
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
+    command: 'publish'
+    publishWebProjects: false
+    projects: 'SystemTrayMenu.csproj'
+    arguments: '-f netcoreapp3.1 -c Release /p:PublishSingleFile=true /p:RuntimeIdentifier=win-x64'
+    zipAfterPublish: false
 
-- task: VSTest@2
+- task: CmdLine@2
+  displayName: Rename single-exe x64
   inputs:
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
+    script: 'rename $(Build.SourcesDirectory)\bin\Release\netcoreapp3.1\win-x64\publish\SystemTrayMenu.exe SystemTrayMenu-x64.exe'
+
+- task: DotNetCoreCLI@2
+  displayName: Publish single-exe x86
+  inputs:
+    command: 'publish'
+    publishWebProjects: false
+    projects: 'SystemTrayMenu.csproj'
+    arguments: '-f netcoreapp3.1 -c Release /p:PublishSingleFile=true /p:RuntimeIdentifier=win-x86'
+    zipAfterPublish: false
+
+- task: CmdLine@2
+  displayName: Rename single-exe x86
+  inputs:
+    script: 'rename $(Build.SourcesDirectory)\bin\Release\netcoreapp3.1\win-x86\publish\SystemTrayMenu.exe SystemTrayMenu-x86.exe' 
+
+- task: CopyFiles@2
+  displayName: 'Copy Files to: $(build.artifactstagingdirectory)'
+  inputs:
+    SourceFolder: '$(Build.SourcesDirectory)\bin\Release\netcoreapp3.1'
+    Contents: |
+     win-x64\publish\SystemTrayMenu-x64.exe
+     win-x86\publish\SystemTrayMenu-x86.exe
+    TargetFolder: '$(build.artifactstagingdirectory)'
+    flattenFolders: true
+
+- task: PublishBuildArtifacts@1
+  displayName: 'Publish Artifact: drop'
+  inputs:
+    PathtoPublish: '$(build.artifactstagingdirectory)'
\ No newline at end of file