diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
new file mode 100644
index 00000000..3f777977
--- /dev/null
+++ b/.github/workflows/docker-build.yml
@@ -0,0 +1,28 @@
+name: Docker CI build
+
+on:
+  push:
+    branches: ['main']
+  pull_request:
+    branches: ['main']
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: false
diff --git a/Dockerfile b/Dockerfile
index 6a6cdfc5..7f45346b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,11 @@
 FROM node:20.18.0-slim AS build
 WORKDIR /app
 COPY . ./
-RUN npm ci \
-  && npm run build
+RUN npm ci && npm run build
 
 # production environment
 FROM nginxinc/nginx-unprivileged:1.27.2-alpine3.20
-COPY --from=build /packages/pxweb2/dist /usr/share/nginx/html
+COPY --from=build /app/packages/pxweb2/dist /usr/share/nginx/html
 COPY nginx/conf.d/default.conf /etc/nginx/conf.d
 EXPOSE 8080
 CMD ["nginx", "-g", "daemon off;"]