diff --git a/Makefile b/Makefile
index f26084d5b..3b547af18 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,9 @@ endif
 BUILDX_FLAGS=$(BUILDX_OP) $(PLATFORM_FLAGS) $(CACHE_FLAGS)
 
 TAG?=$(shell git describe --tags)
+BACKEND_TAG?=$(TAG)
+DEPLOYER_TAG?=$(TAG)
+PROVISIONER_TAG?=$(TAG)
 
 DOCKER?=docker
 
@@ -57,7 +60,7 @@ POSTGRES_TAG?=14
 
 RUST_LOG?=debug
 
-DOCKER_COMPOSE_ENV=STACK=$(STACK) BACKEND_TAG=$(TAG) PROVISIONER_TAG=$(TAG) POSTGRES_TAG=${POSTGRES_TAG} APPS_FQDN=$(APPS_FQDN) DB_FQDN=$(DB_FQDN) POSTGRES_PASSWORD=$(POSTGRES_PASSWORD) RUST_LOG=$(RUST_LOG) CONTAINER_REGISTRY=$(CONTAINER_REGISTRY) MONGO_INITDB_ROOT_USERNAME=$(MONGO_INITDB_ROOT_USERNAME) MONGO_INITDB_ROOT_PASSWORD=$(MONGO_INITDB_ROOT_PASSWORD) DD_ENV=$(DD_ENV) USE_TLS=$(USE_TLS)
+DOCKER_COMPOSE_ENV=STACK=$(STACK) BACKEND_TAG=$(BACKEND_TAG) DEPLOYER_TAG=$(DEPLOYER_TAG) PROVISIONER_TAG=$(PROVISIONER_TAG) POSTGRES_TAG=${POSTGRES_TAG} APPS_FQDN=$(APPS_FQDN) DB_FQDN=$(DB_FQDN) POSTGRES_PASSWORD=$(POSTGRES_PASSWORD) RUST_LOG=$(RUST_LOG) CONTAINER_REGISTRY=$(CONTAINER_REGISTRY) MONGO_INITDB_ROOT_USERNAME=$(MONGO_INITDB_ROOT_USERNAME) MONGO_INITDB_ROOT_PASSWORD=$(MONGO_INITDB_ROOT_PASSWORD) DD_ENV=$(DD_ENV) USE_TLS=$(USE_TLS)
 
 .PHONY: images clean src up down deploy shuttle-% postgres docker-compose.rendered.yml test bump-% deploy-examples publish publish-% --validate-version
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 83cd7a6d0..0291d99b9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -48,7 +48,7 @@ services:
       - "--control=0.0.0.0:8001"
       - "--user=0.0.0.0:8000"
       - "--bouncer=0.0.0.0:7999"
-      - "--image=${CONTAINER_REGISTRY}/deployer:${BACKEND_TAG}"
+      - "--image=${CONTAINER_REGISTRY}/deployer:${DEPLOYER_TAG}"
       - "--prefix=shuttle_"
       - "--network-name=${STACK}_user-net"
       - "--docker-host=/var/run/docker.sock"