diff --git a/.gitea/workflows/build_docker.yaml b/.gitea/workflows/build_docker.yaml
index a488527..12c82ea 100644
--- a/.gitea/workflows/build_docker.yaml
+++ b/.gitea/workflows/build_docker.yaml
@@ -6,14 +6,20 @@ env:
   DOCKER_HOST: tcp://127.0.0.1:2375
 
 jobs:
-  build-x86_64:
-    name: Build Docker x86_64 Image
-    runs-on: docker-x86_64
+  build:
+    strategy:
+      matrix:
+        arch:
+          - x86_64
+          - arm64
+
+    name: Build Docker ${{ matrix.arch }} Image
+    runs-on: docker-${{ matrix.arch }}
     container:
       image: docker:dind
       privileged: true
     env:
-      ARCH: x86_64
+      ARCH: ${{ matrix.arch }}
       VERSIONARCH: ${{ env.VERSION }}-${{ env.ARCH }}
 
     steps:
@@ -49,56 +55,56 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./Dockerfile
+          file: docker/Dockerfile
           push: true
           tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}"
 
-  build-arm64:
-    name: Build Docker arm64 Image
-    runs-on: docker-arm64
-    container:
-      image: docker:dind
-      privileged: true
-    env:
-      ARCH: arm64
-      VERSIONARCH: ${{ env.VERSION }}-${{ env.ARCH }}
-
-    steps:
-      - name: Environment Setup
-        run: |
-          # If we have a proxy use it
-          if [ -n "${HTTP_PROXY}" ]; then echo "HTTP PROXY [${HTTP_PROXY}]"; sed -i -e s'/https/http/' /etc/apk/repositories; fi
-          # Some pre-reqs
-          apk add git curl nodejs
-          # Start docker
-          ( dockerd --host=tcp://0.0.0.0:2375 --tls=false & ) && sleep 3
-          ## Some debugging info
-          # docker info && docker version
-          # env|sort
-
-      - name: Registry FQDN Setup
-        id: registry
-        run: |
-          registry=${{ github.server_url }}
-          echo "registry=${registry##http*://}" >> "$GITHUB_OUTPUT"
-
-      - name: Container Registry Login
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ steps.registry.outputs.registry }}
-          username: ${{ gitea.actor }}
-          password: ${{ secrets.PKG_WRITE_TOKEN }}
-
-      - name: Code Checkout
-        uses: actions/checkout@v4
-
-      - name: Build and Push Docker Image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}"
+#  build-arm64:
+#    name: Build Docker arm64 Image
+#    runs-on: docker-arm64
+#    container:
+#      image: docker:dind
+#      privileged: true
+#    env:
+#      ARCH: arm64
+#      VERSIONARCH: ${{ env.VERSION }}-${{ env.ARCH }}
+#
+#    steps:
+#      - name: Environment Setup
+#        run: |
+#          # If we have a proxy use it
+#          if [ -n "${HTTP_PROXY}" ]; then echo "HTTP PROXY [${HTTP_PROXY}]"; sed -i -e s'/https/http/' /etc/apk/repositories; fi
+#          # Some pre-reqs
+#          apk add git curl nodejs
+#          # Start docker
+#          ( dockerd --host=tcp://0.0.0.0:2375 --tls=false & ) && sleep 3
+#          ## Some debugging info
+#          # docker info && docker version
+#          # env|sort
+#
+#      - name: Registry FQDN Setup
+#        id: registry
+#        run: |
+#          registry=${{ github.server_url }}
+#          echo "registry=${registry##http*://}" >> "$GITHUB_OUTPUT"
+#
+#      - name: Container Registry Login
+#        uses: docker/login-action@v2
+#        with:
+#          registry: ${{ steps.registry.outputs.registry }}
+#          username: ${{ gitea.actor }}
+#          password: ${{ secrets.PKG_WRITE_TOKEN }}
+#
+#      - name: Code Checkout
+#        uses: actions/checkout@v4
+#
+#      - name: Build and Push Docker Image
+#        uses: docker/build-push-action@v5
+#        with:
+#          context: .
+#          file: docker/Dockerfile
+#          push: true
+#          tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}"
 
   manifest:
     name: Final Docker Image Manifest
diff --git a/Dockerfile b/docker/Dockerfile
similarity index 99%
rename from Dockerfile
rename to docker/Dockerfile
index 31f2988..3c9920b 100644
--- a/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-# NAME leenooks/php
+# NAME docker/php
 # VERSION 8.3-fpm-alpine
 
 FROM php:8.3-fpm-alpine
diff --git a/Dockerfile.phptest b/docker/Dockerfile.phptest
similarity index 68%
rename from Dockerfile.phptest
rename to docker/Dockerfile.phptest
index 2fe35de..832e640 100644
--- a/Dockerfile.phptest
+++ b/docker/Dockerfile.phptest
@@ -1,7 +1,7 @@
-# NAME leenooks/php
+# NAME docker/php
 # VERSION 8.3-fpm-test
 
-FROM registry.dege.au/leenooks/php:8.3-fpm
+FROM gitea.dege.au/docker/php:8.3-fpm
 
 # Add xdebug
 RUN apk --no-cache add linux-headers \