diff --git a/build/docker-compose.yml b/build/docker-compose.yml
index f7a4ce6..621aeae 100644
--- a/build/docker-compose.yml
+++ b/build/docker-compose.yml
@@ -3,7 +3,7 @@ name: labca
 services:
   boulder:
     # Should match one of the GO_DEV_VERSIONS in test/boulder-tools/tag_and_upload.sh.
-    image: ghcr.io/hakwerk/labca-boulder:latest
+    image: ghcr.io/hakwerk/labca-boulder:${LABCA_IMAGE_VERSION:-latest}
     environment:
       # To solve HTTP-01 and TLS-ALPN-01 challenges, change the IP in FAKE_DNS
       # to the IP address where your ACME client's solver is listening.
@@ -84,7 +84,7 @@ services:
     command: "consul agent -dev -config-format=hcl -config-file=/opt/boulder/labca/consul/config.hcl"
 
   gui:
-    image: ghcr.io/hakwerk/labca-gui:latest
+    image: ghcr.io/hakwerk/labca-gui:${LABCA_IMAGE_VERSION:-latest}
     networks:
       - bluenet
     volumes:
@@ -123,7 +123,7 @@ services:
       - control
 
   control:
-    image: ghcr.io/hakwerk/labca-control:latest
+    image: ghcr.io/hakwerk/labca-control:${LABCA_IMAGE_VERSION:-latest}
     networks:
       - bluenet
     volumes:
diff --git a/build/tmp.patch b/build/tmp.patch
index 0e5d275..0c53a17 100644
--- a/build/tmp.patch
+++ b/build/tmp.patch
@@ -9,7 +9,7 @@ index cfdcc784a..b50c8b18d 100644
    boulder:
      # Should match one of the GO_DEV_VERSIONS in test/boulder-tools/tag_and_upload.sh.
 -    image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.20.3_2023-04-04}
-+    image: ghcr.io/hakwerk/labca-boulder:latest
++    image: ghcr.io/hakwerk/labca-boulder:${LABCA_IMAGE_VERSION:-latest}
      environment:
        # To solve HTTP-01 and TLS-ALPN-01 challenges, change the IP in FAKE_DNS
        # to the IP address where your ACME client's solver is listening.
@@ -55,7 +55,7 @@ index cfdcc784a..b50c8b18d 100644
  
    gui:
 -    image: *boulder_image
-+    image: ghcr.io/hakwerk/labca-gui:latest
++    image: ghcr.io/hakwerk/labca-gui:${LABCA_IMAGE_VERSION:-latest}
      networks:
        - bluenet
      volumes:
@@ -97,7 +97,7 @@ index cfdcc784a..b50c8b18d 100644
  
    control:
 -    image: *boulder_image
-+    image: ghcr.io/hakwerk/labca-control:latest
++    image: ghcr.io/hakwerk/labca-control:${LABCA_IMAGE_VERSION:-latest}
      networks:
        - bluenet
      volumes: