diff --git a/.azure-pipelines/templates/service.yaml b/.azure-pipelines/templates/service.yaml
index b8ad7bc3d..fae755a5c 100644
--- a/.azure-pipelines/templates/service.yaml
+++ b/.azure-pipelines/templates/service.yaml
@@ -29,7 +29,7 @@ parameters:
 jobs:
   - job: ImageBuild_${{parameters.serviceName}}
     displayName: Build ${{parameters.serviceName}} image
-    condition: or(eq(variables.onMasterBranch, true), eq(variables.onUpdateBranch, true))
+    condition: or(eq(variables.forcePushLatest, true), eq(variables.onMasterBranch, true), eq(variables.onUpdateBranch, true))
     container:
       image: devfra.azurecr.io/de.fraport.build/tools:1.1.0
       endpoint: devfra
@@ -67,7 +67,7 @@ jobs:
             docker push $(imageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber)
       - task: Bash@3
         displayName: Update latest ${{parameters.serviceName}} image
-        condition: eq(variables.onMasterBranch, true)
+        condition: or(eq(variables.forcePushLatest, true), eq(variables.onMasterBranch, true))
         inputs:
           targetType: inline
           script: |