diff --git a/Dockerfile b/Dockerfile
index 80948ca8b..f3a3b7a6d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,7 +54,6 @@ COPY --from=node /build/dist /build/dist
 ARG TARGETOS
 ARG TARGETARCH
 ARG TARGETVARIANT
-ARG TESLA_CLIENT_ID
 
 RUN case "${TARGETVARIANT}" in \
 	"armhf") export GOARM='6' ;; \
@@ -78,6 +77,9 @@ COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /build/evcc /usr/local/bin/evcc
 
+ARG TESLA_CLIENT_ID
+ENV TESLA_CLIENT_ID=${TESLA_CLIENT_ID}
+
 COPY packaging/docker/bin/* /app/
 
 # mDNS
@@ -94,4 +96,4 @@ EXPOSE 9522/udp
 HEALTHCHECK --interval=60s --start-period=60s --timeout=30s --retries=3 CMD [ "evcc", "health" ]
 
 ENTRYPOINT [ "/app/entrypoint.sh" ]
-CMD [ "evcc" ]
+CMD [ "evcc", "vehicle" ]