diff --git a/.github/workflows/build_dev.yml b/.github/workflows/build_dev.yml
index 46f976b..eef3479 100755
--- a/.github/workflows/build_dev.yml
+++ b/.github/workflows/build_dev.yml
@@ -41,9 +41,10 @@ jobs:
           context: ./docker-build
           file: ./docker-build/Dockerfile
           platforms: |
+            linux/amd64
             linux/arm/v7
             linux/arm64
-            linux/amd64
+            linux/riscv64
           push: true
           tags: | 
             ${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:${{ env.VERSION }}-dev
diff --git a/.github/workflows/build_main.yml b/.github/workflows/build_main.yml
index 191bdda..e59c43d 100755
--- a/.github/workflows/build_main.yml
+++ b/.github/workflows/build_main.yml
@@ -36,14 +36,15 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: ./docker-build
           file: ./docker-build/Dockerfile
           platforms: |
+            linux/amd64
             linux/arm/v7
             linux/arm64
-            linux/amd64
+            linux/riscv64
           push: true
           tags: | 
             ${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:${{ env.VERSION }}