diff --git a/Dockerfile b/Dockerfile
index fcc42ed..9f8e342 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV GOARCH=amd64
 WORKDIR /goose.git
 
 RUN git clone https://github.com/pressly/goose.git .
-RUN go build -tags='no_clickhouse no_libsql no_mssql no_mysql no_sqlite3 no_vertica no_ydb' \
+RUN GOARCH=arm64 go build -tags='no_clickhouse no_libsql no_mssql no_mysql no_sqlite3 no_vertica no_ydb' \
         -o goose ./cmd/goose
 
 # Build app
@@ -25,7 +25,7 @@ COPY ./src/internal ./internal
 COPY ./src/web ./web
 
 # Build the application
-RUN  go build -o main cmd/frontend/*
+RUN GOARCH=arm64 go build -o main cmd/frontend/*
 
 
 # --- Stage 3: Run the application ---
diff --git a/Makefile b/Makefile
index cf30f62..3506ee0 100644
--- a/Makefile
+++ b/Makefile
@@ -27,4 +27,4 @@ docker-run: docker-build
 		--rm -p 8080:8080 git.kohout-dev.de/crowsnest/crowsnest:latest
 
 docker-build:
-	docker build --platform linux/amd64 -t git.kohout-dev.de/crowsnest/crowsnest:latest .
+	docker build --platform linux/arm64 -t git.kohout-dev.de/crowsnest/crowsnest:latest .