diff --git a/Dockerfile b/Dockerfile
index 441072b..c600541 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # -----------------------------------------------------
 # 1. Build the Nakama plugin (ARM64)
 # -----------------------------------------------------
-FROM --platform=linux/arm64 golang:1.22-alpine AS plugin_builder
+FROM golang:1.22-alpine AS plugin_builder
 
 # Install dependencies needed for CGO plugin build
 RUN apk add --no-cache git build-base
@@ -37,8 +37,7 @@ COPY local.yml /nakama/data/local.yml
 
 # Default Nakama startup (runs migrations + server)
 ENTRYPOINT [
-  "/bin/sh",
-  "-ecx",
-  "/nakama/nakama migrate up --database.address postgres:localdb@postgres:5432/nakama?sslmode=disable && \
-   exec /nakama/nakama --config /nakama/data/local.yml --database.address postgres:localdb@postgres:5432/nakama?sslmode=disable"
+  "/bin/sh", "-ecx", "\
+  /nakama/nakama migrate up --database.address \"$DB_ADDR\" && \
+  exec /nakama/nakama --config /nakama/data/local.yml --database.address \"$DB_ADDR\""
 ]
diff --git a/docker-compose.yml b/docker-compose.yml
index 6d592d5..71b19d2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,8 +43,8 @@ services:
       - "/bin/sh"
       - "-ecx"
       - >
-        /nakama/nakama migrate up --database.address postgres:localdb@postgres:5432/nakama?sslmode=disable &&
-        exec /nakama/nakama --config /nakama/data/local.yml --database.address postgres:localdb@postgres:5432/nakama?sslmode=disable
+        /nakama/nakama migrate up --database.address "$DB_ADDR" &&
+        exec /nakama/nakama --config /nakama/data/local.yml --database.address "$DB_ADDR"
     volumes:
       - ./local.yml:/nakama/data/local.yml
       - ./build:/nakama/data/modules