diff --git a/.github/workflows/docker_build.yaml b/.github/workflows/docker_build.yaml
index df747bc56e..14ce43b776 100644
--- a/.github/workflows/docker_build.yaml
+++ b/.github/workflows/docker_build.yaml
@@ -15,6 +15,10 @@ jobs:
     steps:
       - name: Checkout Code
         uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
       - name: Login to Dockerhub
         uses: docker/login-action@v1
         with:
@@ -24,6 +28,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ./docker
+          platforms: linux/amd64,linux/arm64
           push: true
           repository: inventree/inventree
           tags: inventree/inventree:latest
diff --git a/.github/workflows/docker_publish.yaml b/.github/workflows/docker_publish.yaml
index 667b860b13..05d8c56b4f 100644
--- a/.github/workflows/docker_publish.yaml
+++ b/.github/workflows/docker_publish.yaml
@@ -13,6 +13,10 @@ jobs:
     steps:
       - name: Check out repo
         uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
       - name: cd
         run: |
           cd docker
@@ -23,4 +27,5 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
           repository: inventree/inventree
           tag_with_ref: true
-          dockerfile: ./Dockerfile
\ No newline at end of file
+          dockerfile: ./Dockerfile
+          platforms: linux/amd64,linux/arm64