diff --git a/Dockerfile b/Dockerfile
index 680997d..06cd8ff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,10 @@
-# Args
 ARG BASE_IMG="quay.io/samba.org/samba-server:latest"
-ARG GIT_VERSION="(unset)"
-ARG COMMIT_ID="(unset)"
-ARG ARCH=""
 
 # Build smbmetrics
 FROM docker.io/golang:1.24 AS builder
+ARG GIT_VERSION="(unset)"
+ARG COMMIT_ID="(unset)"
+ARG ARCH=""
 
 WORKDIR /workspace
 # Copy the Go Modules manifests