diff --git a/.azuredevops/pipelines/templates/build-steps.yml b/.azuredevops/pipelines/templates/build-steps.yml
index 86f7fc21c..111424222 100644
--- a/.azuredevops/pipelines/templates/build-steps.yml
+++ b/.azuredevops/pipelines/templates/build-steps.yml
@@ -5,7 +5,7 @@ steps:
   displayName: 'Use .NET Core sdk '
   inputs:
     packageType: 'sdk'
-    version: '3.x'
+    version: '5.x'
 
 - task: Yarn@3
   displayName: 'Install UI Dependancies'
@@ -18,7 +18,7 @@ steps:
   inputs:
     projectDirectory: '$(UiLocation)'
     arguments: 'run build'
-    
+
 - task: PublishPipelineArtifact@1
   inputs:
     targetPath: '$(UiLocation)dist'
@@ -31,4 +31,4 @@ steps:
     command: 'custom'
     projects: '$(TestProject)'
     custom: 'test'
-  continueOnError: false 
+  continueOnError: false
diff --git a/.azuredevops/pipelines/templates/publish-os-steps.yml b/.azuredevops/pipelines/templates/publish-os-steps.yml
index ad72212cf..a90cf61ff 100644
--- a/.azuredevops/pipelines/templates/publish-os-steps.yml
+++ b/.azuredevops/pipelines/templates/publish-os-steps.yml
@@ -3,7 +3,7 @@ steps:
   displayName: 'Use .NET Core sdk '
   inputs:
     packageType: 'sdk'
-    version: '3.x'
+    version: '5.x'
 
 - task: DotNetCoreInstaller@1
   displayName: 'Use .NET Core sdk for versioning'
@@ -24,23 +24,23 @@ steps:
   inputs:
     command: 'publish'
     publishWebProjects: true
-    arguments: '-c $(BuildConfiguration) -r "$(runtime)"  -o $(Build.ArtifactStagingDirectory)/$(runtime)'
+    arguments: '-c $(BuildConfiguration) -r "$(runtime)" -o $(Build.ArtifactStagingDirectory)/$(runtime)' --self-contained  true -p:PublishSingleFile=true
     zipAfterPublish: false
     modifyOutputPath: false
-    
+
 - task: DownloadPipelineArtifact@2
   inputs:
     buildType: 'current'
     artifactName: 'angular_dist'
     targetPath: '$(Build.ArtifactStagingDirectory)/angular_dist'
-    
+
 - task: CopyFiles@2
   displayName: 'Copy Angular App $(runtime)'
   inputs:
     SourceFolder: '$(Build.ArtifactStagingDirectory)/angular_dist'
     Contents: '**'
     TargetFolder: '$(Build.ArtifactStagingDirectory)/$(runtime)/ClientApp/dist'
-    
+
 - task: ArchiveFiles@2
   displayName: 'Zip $(runtime)'
   inputs:
@@ -49,7 +49,7 @@ steps:
     archiveType: $(compression)
     archiveFile: '$(Build.ArtifactStagingDirectory)/$(runtime).$(format)'
     replaceExistingArchive: true
-    
+
 - task: PublishPipelineArtifact@1
   inputs:
     targetPath: '$(Build.ArtifactStagingDirectory)/$(runtime).$(format)'
diff --git a/.azuredevops/pipelines/templates/variables.yml b/.azuredevops/pipelines/templates/variables.yml
index 507746641..c33cd7999 100644
--- a/.azuredevops/pipelines/templates/variables.yml
+++ b/.azuredevops/pipelines/templates/variables.yml
@@ -12,7 +12,7 @@ variables:
     value: "**/*.Tests.csproj"
 
   - name: "NetCoreVersion"
-    value: "3.1"
+    value: "5.0"
 
   - name: "PublishLocation"
     value: "$(Build.SourcesDirectory)/src/Ombi/bin/Release/netcoreapp$(NetCoreVersion)"