diff --git a/.gitea/workflows/docker_build.yml b/.gitea/workflows/docker_build.yml
index 9df5e15..7c61d33 100644
--- a/.gitea/workflows/docker_build.yml
+++ b/.gitea/workflows/docker_build.yml
@@ -1,23 +1,23 @@
-# .gitea/workflows/docker-build-push.yml
 name: Build and Push Docker Image
 
 on:
   push:
-    # branches:
-    #   - master
     tags:
       - "v*"
 
   workflow_dispatch:
 
 jobs:
-  build-and-push:
+  build-push:
     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
 
@@ -38,7 +38,7 @@ jobs:
         with:
           context: ./tools
           push: true
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           tags: |
             gitea.setlock.net/shaun/dev-container:latest
             gitea.setlock.net/shaun/dev-container:${{ env.GIT_TAG }}
diff --git a/.gitea/workflows/nightly_docker_build.yml b/.gitea/workflows/nightly_docker_build.yml
index 13796a6..4a87d33 100644
--- a/.gitea/workflows/nightly_docker_build.yml
+++ b/.gitea/workflows/nightly_docker_build.yml
@@ -1,4 +1,3 @@
-# .gitea/workflows/docker-build-push.yml
 name: Build and Push Docker Image
 
 on:
@@ -8,13 +7,16 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-amd:
+  build-push:
     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
 
@@ -30,32 +32,6 @@ jobs:
         with:
           context: ./tools
           push: true
-          platforms: linux/amd64
-          tags: |
-            gitea.setlock.net/shaun/dev-container:nightly
-
-  build-arm:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to Gitea Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: gitea.setlock.net
-          username: ${{ secrets.USER }}
-          password: ${{ secrets.TOKEN }}
-
-      - name: Build and Push Docker Image
-        uses: docker/build-push-action@v5
-        with:
-          context: ./tools
-          push: true
-          platforms: linux/arm64
+          platforms: linux/amd64,linux/arm64
           tags: |
             gitea.setlock.net/shaun/dev-container:nightly