diff --git a/.azure-pipelines/templates/jobs/setup_dependencies.yaml b/.azure-pipelines/templates/jobs/setup_dependencies.yaml
index 322175ddd..415f1d6bd 100644
--- a/.azure-pipelines/templates/jobs/setup_dependencies.yaml
+++ b/.azure-pipelines/templates/jobs/setup_dependencies.yaml
@@ -33,8 +33,10 @@ jobs:
   pool: '${{parameters.dependenciesBuildPool}}'
   timeoutInMinutes: ${{parameters.dependenciesBuildTimeout}}
   container:
-    # TODO: do not use latest on update branches
-    image: $(buildImageUpstream)/${{parameters.serviceName}}:latest
+    ${{ if variables.setupImages }}:
+      image: $(buildImageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber)
+    ${{ else }}:
+      image: $(buildImageUpstream)/${{parameters.serviceName}}:latest
     endpoint: devfra
     env:
       PROJECT_DIR: $(Build.Repository.LocalPath)
diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml
index 2a2055f57..19892854d 100755
--- a/azure-pipelines.yaml
+++ b/azure-pipelines.yaml
@@ -92,8 +92,10 @@ stages:
         pool: '${{service.buildPool}}'
         timeoutInMinutes: ${{service.buildTimeout}}
         container:
-          # TODO: do not use latest on update branches
-          image: $(buildImageUpstream)/${{service.name}}:latest
+          ${{ if variables.setupImages }}:
+            image: $(buildImageUpstream)/${{service.name}}:$(Build.BuildNumber)
+          ${{ else }}:
+            image: $(buildImageUpstream)/${{service.name}}:latest
           endpoint: devfra
           env:
             PROJECT_DIR: $(Build.Repository.LocalPath)