diff --git a/Dockerfile.template b/Dockerfile.template
index ac554a1..61bd5d8 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM balenalib/%%BALENA_MACHINE_NAME%%-debian-golang:1.17-bullseye-build as build
+FROM balenalib/%%BALENA_ARCH%%-debian-golang:1.17-build as build
 
 WORKDIR /go/src/github.com/balena-go-hello-world
 
@@ -6,7 +6,7 @@ COPY src/ src/
 
 RUN go mod init && go build /go/src/github.com/balena-go-hello-world/src/server.go
 
-FROM balenalib/%%BALENA_MACHINE_NAME%%-debian:bullseye-run
+FROM balenalib/%%BALENA_ARCH%%-debian:latest-run
 
 WORKDIR /go/src/github.com/balena-go-hello-world