diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 2181222..cc1dfa1 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -48,7 +48,13 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v2
 
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+    
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3      
+
     - name: Build Docker image ${{ matrix.dockerfile }}
       run: |
         cd "$(dirname ${{ matrix.dockerfile }})"
-        docker build . --file Dockerfile
+        docker build --platform linux/amd64,linux/arm64 . --file Dockerfile
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 8fb5d76..c130e08 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -38,6 +38,12 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v2
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3        
+
       - name: Log in to GitHub Docker Registry
         uses: docker/login-action@v1
         with:
@@ -55,6 +61,7 @@ jobs:
       - name: Build container image
         uses: docker/build-push-action@v2
         with:
+          platforms: linux/amd64,linux/arm64
           push: true
           context: ${{ github.event.inputs.folderPath }}
           file: '${{ github.event.inputs.folderPath }}/${{ github.event.inputs.dockerFile }}'