diff --git a/.azure-pipelines/templates/service.yaml b/.azure-pipelines/templates/service.yaml
index 64a02fe5a..e41ddf38d 100644
--- a/.azure-pipelines/templates/service.yaml
+++ b/.azure-pipelines/templates/service.yaml
@@ -74,10 +74,11 @@ jobs:
 
   - job: Build_${{parameters.service.name}}
     displayName: Build ${{parameters.service.name}}
-    # TODO: wait for ImageBuild job iff the job was executed
-    # dependsOn: ImageBuild_${{parameters.service.name}}
-    # condition: succeeded()
+    dependsOn:
+      - ImageBuild_${{parameters.service.name}}
+    condition: or(succeeded(), canceled())
     container:
+      # TODO: use BuildNumber instead of latest in update branches
       # image: devfra.azurecr.io/de.fraport.fradrive.build/frontend:$(Build.BuildNumber)
       image: $(imageUpstream)/${{parameters.service.name}}:latest
       endpoint: devfra