diff --git a/Dockerfile b/Dockerfile
index 546cfa8c4..f366ef628 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,18 +56,12 @@ COPY --from=node /build/dist /build/dist
 ARG TARGETOS
 ARG TARGETARCH
 ARG TARGETVARIANT
-
-RUN case "${TARGETVARIANT}" in \
-	"armhf") export GOARM='6' ;; \
-	"armv7") export GOARM='6' ;; \
-	"v6") export GOARM='6' ;; \
-	"v7") export GOARM='7' ;; \
-	esac;
+ARG GOARM=${TARGETVARIANT#v}
 
 ARG TESLA_CLIENT_ID
 ENV TESLA_CLIENT_ID=${TESLA_CLIENT_ID}
 
-RUN RELEASE=${RELEASE} GOOS=${TARGETOS} GOARCH=${TARGETARCH} make build
+RUN RELEASE=${RELEASE} GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOARM=${GOARM} make build
 
 
 # STEP 3 build a small image including module support