diff --git a/.github/workflows/dockerbuild-nightly.yaml b/.github/workflows/dockerbuild-nightly.yaml
index 36bcb0a6..4e8c11d3 100644
--- a/.github/workflows/dockerbuild-nightly.yaml
+++ b/.github/workflows/dockerbuild-nightly.yaml
@@ -2,6 +2,11 @@ name: nightly-dockerbuild
 
 on:
   workflow_dispatch:
+    inputs:
+      orborus_version:
+        description: "Orborus version to sync (default: nightly)"
+        required: false
+        default: "nightly"
   push:
     branches:
       - nightly
@@ -26,10 +31,6 @@ jobs:
             path: backend
             version: nightly
             experimental: true
-          #- app: orborus
-          #  path: functions/onprem/orborus
-          #  version: nightly
-          #  experimental: true
           - app: worker
             path: functions/onprem/worker
             version: nightly
@@ -80,3 +81,31 @@ jobs:
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
+
+  sync-orborus:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        version: ["${{ github.event.inputs.orborus_version || 'nightly' }}"]
+    steps:
+      - 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: Pull, retag and push orborus
+        run: |
+          docker pull ghcr.io/shuffle/orborus:${{ matrix.version }}
+          docker tag ghcr.io/shuffle/orborus:${{ matrix.version }} ghcr.io/shuffle/shuffle-orborus:${{ matrix.version }}
+          docker tag ghcr.io/shuffle/orborus:${{ matrix.version }} ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-orborus:${{ matrix.version }}
+          docker push ghcr.io/shuffle/shuffle-orborus:${{ matrix.version }}
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-orborus:${{ matrix.version }}
diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml
index 6cb18d51..1f429f03 100644
--- a/.github/workflows/dockerbuild.yaml
+++ b/.github/workflows/dockerbuild.yaml
@@ -2,6 +2,11 @@ name: dockerbuild
 
 on:
   workflow_dispatch:
+    inputs:
+      orborus_version:
+        description: "Orborus version to sync (default: latest)"
+        required: false
+        default: "latest"
   push:
     branches:
       - main
@@ -24,9 +29,6 @@ jobs:
           - app: backend
             path: backend
             experimental: true
-          - app: orborus
-            path: functions/onprem/orborus
-            experimental: true
           - app: worker
             path: functions/onprem/worker
             experimental: true
@@ -73,3 +75,31 @@ jobs:
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
+
+  sync-orborus:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        version: ["${{ github.event.inputs.orborus_version || 'latest' }}"]
+    steps:
+      - 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: Pull, retag and push orborus
+        run: |
+          docker pull ghcr.io/shuffle/orborus:${{ matrix.version }}
+          docker tag ghcr.io/shuffle/orborus:${{ matrix.version }} ghcr.io/shuffle/shuffle-orborus:${{ matrix.version }}
+          docker tag ghcr.io/shuffle/orborus:${{ matrix.version }} ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-orborus:${{ matrix.version }}
+          docker push ghcr.io/shuffle/shuffle-orborus:${{ matrix.version }}
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-orborus:${{ matrix.version }}
diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml
index 41e3bfe8..cb8e67e7 100644
--- a/.github/workflows/helm-release.yml
+++ b/.github/workflows/helm-release.yml
@@ -45,7 +45,7 @@ jobs:
             CHART_VERSION="${VERSION}"
           else
             APP_VERSION="latest"
-            CHART_VERSION="2.2.0"
+            CHART_VERSION="2.2.1"
           fi
 
           echo "APP_VERSION set to ${APP_VERSION}"
diff --git a/.github/workflows/tagged-nightly-release.yaml b/.github/workflows/tagged-nightly-release.yaml
index 812e01d3..2dd41f6e 100644
--- a/.github/workflows/tagged-nightly-release.yaml
+++ b/.github/workflows/tagged-nightly-release.yaml
@@ -30,9 +30,6 @@ jobs:
           - app: app_sdk
             path: backend/app_sdk
             experimental: true
-          - app: orborus
-            path: functions/onprem/orborus
-            experimental: true
           - app: worker
             path: functions/onprem/worker
             experimental: true
@@ -92,4 +89,40 @@ jobs:
             frikky/shuffle:${{ matrix.app }}
 
       - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
\ No newline at end of file
+        run: echo ${{ steps.docker_build.outputs.digest }}
+
+  sync-orborus:
+    if: github.event.release.target_commitish == 'nightly'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set version
+        id: set_version
+        run: |
+          if [[ ${{ github.event_name }} == 'release' ]]; then
+            VERSION="${{ github.event.release.tag_name }}"
+            VERSION=${VERSION#v}
+            echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
+          else
+            echo "VERSION=nightly-untagged-latest" >> $GITHUB_OUTPUT
+          fi
+
+      - 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: Pull, retag and push orborus
+        run: |
+          docker pull ghcr.io/shuffle/orborus:${{ steps.set_version.outputs.VERSION }}
+          docker tag ghcr.io/shuffle/orborus:${{ steps.set_version.outputs.VERSION }} ghcr.io/shuffle/shuffle-orborus:${{ steps.set_version.outputs.VERSION }}
+          docker tag ghcr.io/shuffle/orborus:${{ steps.set_version.outputs.VERSION }} ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-orborus:${{ steps.set_version.outputs.VERSION }}
+          docker push ghcr.io/shuffle/shuffle-orborus:${{ steps.set_version.outputs.VERSION }}
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-orborus:${{ steps.set_version.outputs.VERSION }}
\ No newline at end of file