diff --git a/.azure-pipelines/templates/service.yaml b/.azure-pipelines/templates/service.yaml
index 1e27a5263..61c87300f 100644
--- a/.azure-pipelines/templates/service.yaml
+++ b/.azure-pipelines/templates/service.yaml
@@ -40,7 +40,6 @@ stages:
     - job: ImageBuild_${{parameters.serviceName}}
       displayName: Build ${{parameters.serviceName}} image
       condition: or(eq(variables.forcePushLatest, true), eq(variables.onMasterBranch, true), eq(variables.onUpdateBranch, true))
-      timeoutInMinutes: ${{ parameters.serviceTimeout }}
       container:
         image: devfra.azurecr.io/de.fraport.build/tools:1.1.0
         endpoint: devfra
@@ -98,6 +97,7 @@ stages:
       dependsOn:
         - ImageBuild_${{parameters.serviceName}}
       condition: in(dependencies.ImageBuild_${{parameters.serviceName}}.result, 'Succeeded', 'Skipped')
+      timeoutInMinutes: ${{ parameters.serviceTimeout }}
       container:
         # TODO: use BuildNumber instead of latest in update branches
         # image: devfra.azurecr.io/de.fraport.fradrive.build/frontend:$(Build.BuildNumber)