diff --git a/.azure-pipelines/templates/service.yaml b/.azure-pipelines/templates/service.yaml
index 576d8209c..152b1f6cb 100755
--- a/.azure-pipelines/templates/service.yaml
+++ b/.azure-pipelines/templates/service.yaml
@@ -59,7 +59,7 @@ stages:
             script: |
               cp docker/${{parameters.serviceName}}/Dockerfile .
               docker build \
-              --tag $(imageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber) \
+              --tag $(buildImageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber) \
               --build-arg FROM_IMG=${{parameters.serviceBase.image}} \
               --build-arg FROM_TAG=${{parameters.serviceBase.tag}} \
               --build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080 \
@@ -75,15 +75,15 @@ stages:
           inputs:
             targetType: inline
             script: |
-              docker push $(imageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber)
+              docker push $(buildImageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber)
         - task: Bash@3
           displayName: Update latest ${{parameters.serviceName}} image
           condition: or(eq(variables.forcePushLatest, true), eq(variables.onMasterBranch, true))
           inputs:
             targetType: inline
             script: |
-              docker tag $(imageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber) $(imageUpstream)/${{parameters.serviceName}}:latest
-              docker push $(imageUpstream)/${{parameters.serviceName}}:latest
+              docker tag $(buildImageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber) $(buildImageUpstream)/${{parameters.serviceName}}:latest
+              docker push $(buildImageUpstream)/${{parameters.serviceName}}:latest
         - task: Docker@2
           displayName: Logout from container registry
           inputs:
@@ -99,7 +99,7 @@ stages:
       container:
         # TODO: use BuildNumber instead of latest in update branches
         # image: devfra.azurecr.io/de.fraport.fradrive.build/frontend:$(Build.BuildNumber)
-        image: $(imageUpstream)/${{parameters.serviceName}}:latest
+        image: $(buildImageUpstream)/${{parameters.serviceName}}:latest
         endpoint: devfra
         env:
           PROJECT_DIR: $(Build.Repository.LocalPath)
diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml
index 1c26871aa..3d0e7f36f 100755
--- a/azure-pipelines.yaml
+++ b/azure-pipelines.yaml
@@ -52,7 +52,7 @@ parameters:
           .stack-work/**/*
 
 variables:
-  imageUpstream: devfra.azurecr.io/de.fraport.fradrive.build
+  buildImageUpstream: devfra.azurecr.io/de.fraport.fradrive.build
   onMasterBranch: $[eq(variables['Build.SourceBranch'], 'refs/heads/master')]
   onUpdateBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/update')]