diff --git a/build/azure-devops/agents-scraper-release-official.yml b/build/azure-devops/agents-scraper-release-official.yml
index 58b2d10dc..f96c6f58f 100644
--- a/build/azure-devops/agents-scraper-release-official.yml
+++ b/build/azure-devops/agents-scraper-release-official.yml
@@ -4,11 +4,15 @@ resources:
 trigger: none
 pr: none
 variables:
-  DotNet.SDK.Version: '3.1.101'
-  Image.Name: 'tomkerkhove/promitor-agent-scraper'
-  Image.TaggedName: '$(Image.Name):$(Image.Version)'
-  Release.TagName: '$(Build.BuildNumber)'
-  Helm.App.Version: '$(Image.Version)'
+  - template: ./variables/build.yml
+  - name: 'Image.Name'
+    value: 'tomkerkhove/promitor-agent-scraper'
+  - name: 'Image.TaggedName'
+    value: '$(Image.Name):$(Image.Version)'
+  - name: 'Release.TagName'
+    value: '$(Build.BuildNumber)'
+  - name: 'Helm.App.Version'
+    value: '$(Image.Version)'
   # Release.Title is configured in the build definition as settable at queue time
   # Image.Version is configured in the build definition as settable at queue time
   # Helm.Chart.Version is configured in the build definition as settable at queue time
diff --git a/build/azure-devops/agents-scraper-release-preview.yml b/build/azure-devops/agents-scraper-release-preview.yml
index a1ca81eb1..2555bf5f3 100644
--- a/build/azure-devops/agents-scraper-release-preview.yml
+++ b/build/azure-devops/agents-scraper-release-preview.yml
@@ -4,10 +4,15 @@ resources:
 trigger: none
 pr: none
 variables:
-  DotNet.SDK.Version: '3.1.101'
-  Image.Name: 'tomkerkhove/promitor-agent-scraper'
-  Image.TaggedName: '$(Image.Name):$(Image.Version)'
-  Release.TagName: '$(Build.BuildNumber)'
+  - template: ./variables/build.yml
+  - name: 'Image.Name'
+    value: 'tomkerkhove/promitor-agent-scraper'
+  - name: 'Image.TaggedName'
+    value: '$(Image.Name):$(Image.Version)'
+  - name: 'Release.TagName'
+    value: '$(Build.BuildNumber)'
+  - name: 'Helm.App.Version'
+    value: '$(Image.Version)'
   # Release.Title is configured in the build definition as settable at queue time
   # Image.Version is configured in the build definition as settable at queue time
 stages:
diff --git a/build/azure-devops/variables/build.yml b/build/azure-devops/variables/build.yml
new file mode 100644
index 000000000..c2bd4a483
--- /dev/null
+++ b/build/azure-devops/variables/build.yml
@@ -0,0 +1,2 @@
+variables:
+  DotNet.Sdk.Version: '3.1.200'
\ No newline at end of file
diff --git a/src/Promitor.Scraper.Host/Dockerfile b/src/Promitor.Scraper.Host/Dockerfile
index a062ca175..6456cbb14 100644
--- a/src/Promitor.Scraper.Host/Dockerfile
+++ b/src/Promitor.Scraper.Host/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1.102-alpine AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1.200-alpine AS build
 WORKDIR /src
 COPY Promitor.Core/* Promitor.Core/
 COPY Promitor.Core.Configuration/* Promitor.Core.Configuration/