diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 8ae6b6cc..ee559082 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -12,8 +12,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2   
+      
     - name: Get tag
       id: tag
       uses: dawidd6/action-get-tag@v1
@@ -29,5 +36,7 @@ jobs:
     - name: Build and push
       uses: docker/build-push-action@v3
       with:
+        context: .
+        platforms: linux/amd64,linux/arm64
         push: true
-        tags: illuspas/node-media-server:latest, illuspas/node-media-server:${{steps.tag.outputs.tag}}
+        tags: illuspas/node-media-server:latest, illuspas/node-media-server:${{steps.tag.outputs.tag}}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index c0a87500..d558ab44 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:lts-alpine
+FROM --platform=$TARGETPLATFORM node:lts-alpine
 
 WORKDIR /node-media-server