diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml
index d5fb8d78..96042544 100644
--- a/.github/workflows/dockerbuild.yaml
+++ b/.github/workflows/dockerbuild.yaml
@@ -20,19 +20,19 @@ jobs:
         include:
           - app: frontend
             path: frontend
-            version: 2.2.0
+            version: 2.2.1
             experimental: true
           - app: backend
             path: backend
-            version: 2.2.0
+            version: 2.2.1
             experimental: true
           - app: orborus
             path: functions/onprem/orborus
-            version: 2.2.0
+            version: 2.2.1
             experimental: true
           - app: worker
             path: functions/onprem/worker
-            version: 2.2.0
+            version: 2.2.1
             experimental: true
     steps:
       - name: Checkout
@@ -59,7 +59,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Ghcr Build and push
+      - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v4
         env:
@@ -73,11 +73,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
           tags: |
-            ghcr.io/shuffle/shuffle-${{ matrix.app }}:${{ matrix.version }}
             ghcr.io/shuffle/shuffle-${{ matrix.app }}:latest
-            ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-${{ matrix.app }}:${{ matrix.version }}
-            frikky/shuffle-${{ matrix.app }}:${{ matrix.version }}
-            frikky/shuffle:${{ matrix.app }}
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/tagged-release.yaml b/.github/workflows/tagged-release.yaml
new file mode 100644
index 00000000..cc6822a9
--- /dev/null
+++ b/.github/workflows/tagged-release.yaml
@@ -0,0 +1,75 @@
+name: Tagged Release
+on:
+  release:
+    types: [published]
+    branches:
+      - main
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - app: frontend
+            path: frontend
+            experimental: true
+          - app: backend
+            path: backend
+            experimental: true
+          - app: worker
+            path: functions/onprem/worker
+            experimental: true
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set version
+        id: set_version
+        run: |
+          echo "VERSION=${{ github.event.release.tag_name }}" >> $GITHUB_OUTPUT
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: "amd64,arm64,arm"
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to Ghcr
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v4
+        env:
+          BUILDX_NO_DEFAULT_LOAD: true
+        with:
+          logout: false
+          context: ${{ matrix.path }}/
+          file: ${{ matrix.path }}/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+          tags: |
+            ghcr.io/shuffle/shuffle-${{ matrix.app }}:${{ steps.set_version.outputs.VERSION }}
+            ghcr.io/shuffle/shuffle-${{ matrix.app }}:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-${{ matrix.app }}:${{ steps.set_version.outputs.VERSION }}
+            frikky/shuffle-${{ matrix.app }}:${{ steps.set_version.outputs.VERSION }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}