diff --git a/.github/workflows/development-build.yml b/.github/workflows/development-build.yml
index acfc8724c..7011fb1cc 100644
--- a/.github/workflows/development-build.yml
+++ b/.github/workflows/development-build.yml
@@ -47,7 +47,7 @@ jobs:
             file: docker/prod-ssu/Dockerfile
             platforms: linux/aarch64
             push: true
-            tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:aarch64-next
+            tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next-aarch64
   merge-manifest:
       runs-on: ubuntu-latest
       permissions:
@@ -69,4 +69,8 @@ jobs:
             password: ${{ secrets.GITHUB_TOKEN  }}
         - name: Create & publish manifest
           run: |
-            docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:aarch64-next --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next
\ No newline at end of file
+            docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next
+        - uses: sarisia/actions-status-discord@v1
+          if: always()
+          with:
+            webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL  }}
\ No newline at end of file
diff --git a/.github/workflows/production-build.yml b/.github/workflows/production-build.yml
index f77010aee..a6ac2f651 100644
--- a/.github/workflows/production-build.yml
+++ b/.github/workflows/production-build.yml
@@ -9,7 +9,7 @@ env:
   IMAGE_NAME: "coollabsio/coolify"
 
 jobs:
-  build:
+  arm64:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -31,6 +31,54 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
+  aarch64:
+    runs-on: [self-hosted, arm64]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Login to ghcr.io
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN  }}
+      - name: Get Version
+        id: version
+        run: |
+          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT
+      - name: Build image and push to registry
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: docker/prod-ssu/Dockerfile
+          platforms: linux/aarch64
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
+  merge-manifest:
+      runs-on: ubuntu-latest
+      permissions:
+        contents: read
+        packages: write
+      needs: [amd64, aarch64]
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v3
+        - name: Set up QEMU
+          uses: docker/setup-qemu-action@v2
+        - name: Set up Docker Buildx
+          uses: docker/setup-buildx-action@v2
+        - name: Login to ghcr.io
+          uses: docker/login-action@v2
+          with:
+            registry: ${{ env.REGISTRY }}
+            username: ${{ github.actor }}
+            password: ${{ secrets.GITHUB_TOKEN  }}
+        - name: Get Version
+          id: version
+          run: |
+            echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT
+        - name: Create & publish manifest
+          run: |
+            docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with: