diff --git a/.goreleaser-nightly.yml b/.goreleaser-nightly.yml
index 36b33f9bc..d81a33db0 100644
--- a/.goreleaser-nightly.yml
+++ b/.goreleaser-nightly.yml
@@ -25,6 +25,9 @@ builds:
         goarch: arm
       - goos: windows
         goarch: arm64
+    docker:
+      build_flag_templates:
+        - "--build-arg=TESLA_CLIENT_ID=${TESLA_CLIENT_ID}"
 
 archives:
   - builds:
diff --git a/.goreleaser.yml b/.goreleaser.yml
index de6f35d36..cb88a230d 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -29,6 +29,9 @@ builds:
         goarch: arm
       - goos: windows
         goarch: arm64
+    docker:
+      build_flag_templates:
+        - "--build-arg=TESLA_CLIENT_ID=${TESLA_CLIENT_ID}"
 
 env:
   - CGO_ENABLED=0
diff --git a/Dockerfile b/Dockerfile
index d95643441..80948ca8b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,6 +54,7 @@ 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' ;; \