diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 7ec22d7..6c23385 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -1,3 +1,5 @@
+version: 2
+
 before:
   hooks:
     - go mod tidy
@@ -27,13 +29,12 @@ dockers:
     build_flag_templates:
       - "--pull"
       - "--platform=linux/amd64"
+      - "--build-arg=ARCH=amd64"
       - "--label=org.opencontainers.image.created={{.Date}}"
       - "--label=org.opencontainers.image.title={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
       - "--label=org.opencontainers.image.version={{.Version}}"
       - "--label=org.opencontainers.image.source=https://github.com/bnema/gordon"
-    extra_files:
-      - .iscontainer
   - image_templates:
       - "ghcr.io/bnema/gordon:{{ .Tag }}-arm64"
     use: buildx
@@ -42,13 +43,12 @@ dockers:
     build_flag_templates:
       - "--pull"
       - "--platform=linux/arm64"
+      - "--build-arg=ARCH=arm64"
       - "--label=org.opencontainers.image.created={{.Date}}"
       - "--label=org.opencontainers.image.title={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
       - "--label=org.opencontainers.image.version={{.Version}}"
       - "--label=org.opencontainers.image.source=https://github.com/bnema/gordon"
-    extra_files:
-      - .iscontainer
 
 archives:
   - format: zip
@@ -59,4 +59,4 @@ changelog:
   filters:
     exclude:
       - "^docs:"
-      - "^test:"
\ No newline at end of file
+      - "^test:"
diff --git a/Dockerfile b/Dockerfile
index 6a0e168..5126816 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,8 @@
-# Start from scratch
 FROM alpine:latest
 
-ARG ARCH
+COPY gordon /gordon
 
-# Copy the pre-built binary for the specific architecture
-COPY dist/gordon-linux-${ARCH} /gordon
-# Create the .iscontainer file
 RUN touch /.iscontainer
 
-# Set the entrypoint
 ENTRYPOINT ["/gordon"]
-
-# Default command
 CMD ["serve"]