diff --git a/.github/workflows/2_unstable.yml b/.github/workflows/2_unstable.yml
index e6558fd7..46806117 100644
--- a/.github/workflows/2_unstable.yml
+++ b/.github/workflows/2_unstable.yml
@@ -462,8 +462,36 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
         
-      - name: Docker Upload :base
-        run: docker buildx build --push --cache-from=type=local,src=/tmp/.buildx-cache
+      - name: Docker Upload amd64 :base
+        run: docker buildx build --builder statping-base --push --cache-from=type=local,src=/tmp/.buildx-cache --push --cache-from=type=local,src=/tmp/.buildx-cache --platform linux/amd64 -f Dockerfile.base -t adamboutcher/statping-ng:base .
+
+      - name: Docker Login
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
+        
+      - name: Docker Upload arm64 :base
+        run: docker buildx build --builder statping-base --push --cache-from=type=local,src=/tmp/.buildx-cache --push --cache-from=type=local,src=/tmp/.buildx-cache --platform llinux/arm64 -f Dockerfile.base -t adamboutcher/statping-ng:base .
+
+
+      - name: Docker Login
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
+        
+      - name: Docker Upload arm7 :base
+        run: docker buildx build --builder statping-base --push --cache-from=type=local,src=/tmp/.buildx-cache --push --cache-from=type=local,src=/tmp/.buildx-cache --platform inux/arm/v7 -f Dockerfile.base -t adamboutcher/statping-ng:base .
+
+      - name: Docker Login
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
+        
+      - name: Docker Upload arm6 :base
+        run: docker buildx build --builder statping-base --push --cache-from=type=local,src=/tmp/.buildx-cache --push --cache-from=type=local,src=/tmp/.buildx-cache --platform linux/arm/v6 -f Dockerfile.base -t adamboutcher/statping-ng:base .
 
       - name: Docker Build :dev
         run: make buildx-dev
@@ -477,6 +505,9 @@ jobs:
       - name: Docker Upload :dev
         run: docker buildx build --push --cache-from=type=local,src=/tmp/.buildx-cache
 
+      - name: Clean
+        run: docker buildx rm statping-base && docker buildx rm statping-dev
+
 
 #  sentry-release:
 #    needs: [test, test-postman-sqlite, test-postman-postgres, test-postman-mysql]