diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b68890f3..45f2c680 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -95,6 +95,7 @@ jobs:
         with:
           context: .
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
diff --git a/Dockerfile b/Dockerfile
index 2d318a33..f5c491d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,12 +14,10 @@ RUN npm install --no-package-lock
 # Build the application
 RUN npm run build
 
-ENV CLIENT_PORT=6274
-ENV SERVER_PORT=6277
+ARG CLIENT_PORT=6274
+ARG SERVER_PORT=6277
 
-# Expose the CLIENT_PORT and SERVER_PORT
-EXPOSE $CLIENT_PORT
-EXPOSE $SERVER_PORT
+EXPOSE ${CLIENT_PORT} ${SERVER_PORT}
 
 # Use ENTRYPOINT with CMD for arguments
 ENTRYPOINT ["npm", "start"]