diff --git a/internal/pkg/image_repositories/build_workflow.go b/internal/pkg/image_repositories/build_workflow.go
index 2721b51..2196a4a 100644
--- a/internal/pkg/image_repositories/build_workflow.go
+++ b/internal/pkg/image_repositories/build_workflow.go
@@ -77,6 +77,7 @@
 	}
 
 	buildArgs := []string{
+		"BUILDER_IMAGE=quay.io/vexxhost/openstack-builder-${{ matrix.from }}",
 		"RUNTIME_IMAGE=quay.io/vexxhost/openstack-runtime-${{ matrix.from }}",
 		"RELEASE=${{ matrix.release }}",
 		fmt.Sprintf("PROJECT=%s", project),
diff --git a/internal/pkg/image_repositories/template/Dockerfile b/internal/pkg/image_repositories/template/Dockerfile
index 50b16ea..e1008f7 100644
--- a/internal/pkg/image_repositories/template/Dockerfile
+++ b/internal/pkg/image_repositories/template/Dockerfile
@@ -1,10 +1,11 @@
 # syntax=docker/dockerfile-upstream:master-labs
 
+ARG BUILDER_IMAGE={{ .BuilderImage }}
 ARG RUNTIME_IMAGE={{ .RuntimeImage }}
 
 FROM {{ .BindepImage }}:{{ .BindepImageTag }} AS bindep
 
-FROM {{ .BuilderImage }}:{{ .BuilderImageTag }} AS builder
+FROM ${BUILDER_IMAGE}:{{ .BuilderImageTag }} AS builder
 COPY --from=bindep --link /runtime-pip-packages /runtime-pip-packages
 
 FROM ${RUNTIME_IMAGE}:{{ .RuntimeImageTag }} AS runtime