diff --git a/package.json b/package.json
index b754808f70..1c4ca18cd8 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "url": "https://github.com/inovex/scrumlr.io/issues",
     "email": "info@scrumlr.io"
   },
-  "version": "3.8.1",
+  "version": "3.8.2",
   "private": true,
   "license": "MIT",
   "dependencies": {
diff --git a/server/src/Dockerfile b/server/src/Dockerfile
index 981731f8fa..345ed2ded5 100644
--- a/server/src/Dockerfile
+++ b/server/src/Dockerfile
@@ -1,8 +1,12 @@
 # Build application
 FROM golang:1.22
+
+ARG TARGETARCH
+ARG TARGETOS
+
 WORKDIR /go/src/github.com/inovex/scrumlr.io/
 COPY ./ .
-RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a -o main
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -a -o main
 
 # Start application
 FROM alpine:3.20