diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml
index 3c5af3bdf..8e0bccdbd 100644
--- a/azure-pipelines.yaml
+++ b/azure-pipelines.yaml
@@ -5,8 +5,8 @@
 pool: 'Prod Private Agent Pool'
 
 variables:
-  FRADRIVE_IMAGE_UPSTREAM: devfra.azurecr.io/de.fraport.fradrive.build
-  IMAGE_LATEST_RETAG_BRANCH: 'refs/head/master'
+  imageFradriveUpstream: devfra.azurecr.io/de.fraport.fradrive.build
+  imageRetagLatestBranch: 'refs/head/master'
 
 jobs:
 - job: FrontendImage
@@ -38,21 +38,21 @@ jobs:
           --build-arg MOUNT_DIR=$(Build.Repository.LocalPath) \
           --build-arg PROJECT_DIR=/fradrive \
           --build-arg IN_CI=true \
-          --tag ${{FRADRIVE_IMAGE_UPSTREAM}}/frontend:$(Build.BuildNumber) \
+          --tag ${{variables.imageFradriveUpstream}}/frontend:$(Build.BuildNumber) \
           .
     - task: Bash@3
       displayName: Push frontend image
       inputs:
         targetType: inline
         script: |
-          docker push ${{FRADRIVE_IMAGE_UPSTREAM}}/frontend:$(Build.BuildNumber)
+          docker push ${{variables.imageFradriveUpstream}}/frontend:$(Build.BuildNumber)
     - task: Bash@3
       displayName: Update latest frontend image
-      condition: eq(variables['Build.SourceBranch'], ${{IMAGE_LATEST_RETAG_BRANCH}})
+      condition: eq(variables['Build.SourceBranch'], ${{variables.imageRetagLatestBranch}})
       inputs:
         targetType: inline
         script: |
-          docker push ${{FRADRIVE_IMAGE_UPSTREAM}}/frontend:$(Build.BuildNumber) ${{FRADRIVE_IMAGE_UPSTREAM}}/frontend:latest
+          docker push ${{variables.imageFradriveUpstream}}/frontend:$(Build.BuildNumber) ${{variables.imageFradriveUpstream}}/frontend:latest
     - task: Docker@2
       name: dockerLogoutDevFra
       displayName: Docker Logout from devfra