diff --git a/.github/workflows/cd-hagrid.yml b/.github/workflows/cd-hagrid.yml
index f1f44444c12..94bf7509f83 100644
--- a/.github/workflows/cd-hagrid.yml
+++ b/.github/workflows/cd-hagrid.yml
@@ -46,7 +46,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.SYFT_BUMP_TOKEN }}
+          token: ${{ secrets.SYFT_BOT_COMMIT_TOKEN }}
       - name: Install checksumdir
         run: |
           pip install --upgrade checksumdir
@@ -85,13 +85,12 @@ jobs:
 
       - name: Commit changes
         if: ${{needs.hagrid-deploy.outputs.current_hash}} != ${{needs.hagrid-deploy.outputs.previous_hash}}
-        uses: EndBug/add-and-commit@v7
+        uses: EndBug/add-and-commit@v9
         with:
-          author_name: Madhava Jay
-          author_email: madhava@openmined.org
-          message: "bump version"
+          author_name: ${{ secrets.OM_BOT_NAME }}
+          author_email: ${{ secrets.OM_BOT_EMAIL }}
+          message: "[hagrid] bump version"
           add: "['./packages/hagrid/.bumpversion.cfg','./packages/hagrid/setup.py','./packages/hagrid/hagrid/version.py', './scripts/hagrid_hash', './packages/hagrid/hagrid/manifest_template.yml']"
-          pull_strategy: NO-PULL
 
       - name: Build and publish
         if: ${{needs.hagrid-deploy.outputs.current_hash}} != ${{needs.hagrid-deploy.outputs.previous_hash}}
diff --git a/.github/workflows/cd-syft-dev.yml b/.github/workflows/cd-syft-dev.yml
new file mode 100644
index 00000000000..65fc02e9093
--- /dev/null
+++ b/.github/workflows/cd-syft-dev.yml
@@ -0,0 +1,152 @@
+name: CD - Syft - Deploy `dev` to K8s
+
+on:
+  # TODO: Re-enable once merged & tested
+  # schedule:
+  #   - cron: "0 */3 * * *"
+
+  workflow_dispatch:
+    inputs:
+      none:
+        description: "Run Tests Manually"
+        required: false
+
+jobs:
+  deploy-syft-dev:
+    runs-on: om-ci-16vcpu-ubuntu2204
+    steps:
+      - name: Permission to home directory
+        run: |
+          sudo chown -R $USER:$USER $HOME
+
+      - uses: actions/checkout@v4
+
+      # Checkout Infra repo (nested)
+      - name: Checkout Infra Repo
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ secrets.INFRA_REPO }}
+          ref: "main"
+          token: ${{ secrets.INFRA_BOT_COMMIT_TOKEN }}
+          path: infrastructure
+
+      - name: Set up Python
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.11"
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Azure container registry
+        uses: azure/docker-login@v1
+        with:
+          login-server: ${{ secrets.ACR_SERVER }}
+          username: ${{ secrets.ACR_USERNAME }}
+          password: ${{ secrets.ACR_PASSWORD }}
+
+      - name: Set Grid package version
+        id: grid
+        shell: bash
+        run: echo "GRID_VERSION=$(python packages/grid/VERSION)" >> $GITHUB_OUTPUT
+
+      - name: Build and push `grid-backend` image to DockerHub
+        uses: docker/build-push-action@v4
+        with:
+          context: ./packages
+          file: ./packages/grid/backend/backend.dockerfile
+          push: true
+          target: backend
+          tags: |
+            ${{ secrets.ACR_SERVER }}/openmined/grid-backend:dev
+            ${{ secrets.ACR_SERVER }}/openmined/grid-backend:dev-${{ github.sha }}
+
+      - name: Build and push `grid-frontend` image to DockerHub
+        uses: docker/build-push-action@v4
+        with:
+          context: ./packages/grid/frontend
+          file: ./packages/grid/frontend/frontend.dockerfile
+          push: true
+          tags: |
+            ${{ secrets.ACR_SERVER }}/openmined/grid-frontend:dev
+            ${{ secrets.ACR_SERVER }}/openmined/grid-frontend:dev-${{ github.sha }}
+          target: grid-ui-development
+
+      # TODO: Re-enable once we have Enclave up and running
+      # - name: Build and push `grid-enclave` image to DockerHub
+      #   uses: docker/build-push-action@v4
+      #   with:
+      #     context: ./packages
+      #     file: ./packages/grid/worker/worker.dockerfile
+      #     push: true
+      #     target: worker
+      #     tags: |
+      #       ${{ secrets.ACR_SERVER }}/openmined/grid-enclave:dev
+      #       ${{ secrets.ACR_SERVER }}/openmined/grid-enclave:dev-${{ github.sha }}
+
+      - name: Build and push `grid-headscale` image to DockerHub
+        uses: docker/build-push-action@v4
+        with:
+          context: ./packages/grid/vpn
+          file: ./packages/grid/vpn/headscale.dockerfile
+          push: true
+          tags: |
+            ${{ secrets.ACR_SERVER }}/openmined/grid-headscale:dev
+            ${{ secrets.ACR_SERVER }}/openmined/grid-headscale:dev-${{ github.sha }}
+
+      - name: Build and push `grid-tailscale` image to DockerHub
+        uses: docker/build-push-action@v4
+        with:
+          context: ./packages/grid/vpn
+          file: ./packages/grid/vpn/tailscale.dockerfile
+          push: true
+          tags: |
+            ${{ secrets.ACR_SERVER }}/openmined/grid-tailscale:dev
+            ${{ secrets.ACR_SERVER }}/openmined/grid-tailscale:dev-${{ github.sha }}
+
+      - name: Build and push `grid-vpn-iptables` image to DockerHub
+        uses: docker/build-push-action@v2
+        with:
+          context: ./packages/grid/vpn
+          file: ./packages/grid/vpn/iptables.dockerfile
+          push: true
+          tags: |
+            ${{ secrets.ACR_SERVER }}/openmined/grid-vpn-iptables:dev
+            ${{ secrets.ACR_SERVER }}/openmined/grid-vpn-iptables:dev-${{ github.sha }}
+
+      - name: Build Helm Chart & Copy to infra
+        shell: bash
+        run: |
+          K3D_VERSION=v5.6.0
+          DEVSPACE_VERSION=v6.3.3
+
+          # install k3d
+          wget https://github.com/k3d-io/k3d/releases/download/${K3D_VERSION}/k3d-linux-amd64
+          mv k3d-linux-amd64 k3d
+          chmod +x k3d
+          export PATH=`pwd`:$PATH
+          k3d version
+
+          # Install devspace
+          curl -sSL https://github.com/loft-sh/devspace/releases/download/${DEVSPACE_VERSION}/devspace-linux-amd64 -o ./devspace
+          chmod +x devspace
+          devspace version
+
+          export CONTAINER_REGISTRY=${{ secrets.ACR_SERVER }}
+          export VERSION=dev-${{github.sha}}
+          tox -e syft.build.helm
+
+          rm -rf infrastructure/gitops/environments/dev/
+          mkdir -p infrastructure/gitops/environments/dev/
+          cp -R packages/grid/helm/syft/. packages/grid/helm/manifests.yaml infrastructure/gitops/environments/dev/
+
+      - name: Commit & push changes to Infra Repo
+        uses: EndBug/add-and-commit@v9
+        with:
+          author_name: ${{ secrets.OM_BOT_NAME }}
+          author_email: ${{ secrets.OM_BOT_EMAIL }}
+          message: "[env] Update dev helm charts"
+          add: "."
+          push: "origin main"
+          cwd: "./infrastructure/"
diff --git a/.github/workflows/cd-syft.yml b/.github/workflows/cd-syft.yml
index 3fbc3a5394b..506c7a9d351 100644
--- a/.github/workflows/cd-syft.yml
+++ b/.github/workflows/cd-syft.yml
@@ -48,7 +48,7 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.OM_BOT_TOKEN }}
+          token: ${{ secrets.SYFT_BOT_COMMIT_TOKEN }}
 
       - name: Set up Python
         uses: actions/setup-python@v3
@@ -90,7 +90,7 @@ jobs:
         with:
           author_name: ${{ secrets.OM_BOT_NAME }}
           author_email: ${{ secrets.OM_BOT_EMAIL }}
-          message: "bump version"
+          message: "[syft]bump version"
           add: "['.bumpversion.cfg', 'VERSION', 'packages/grid/VERSION', 'packages/grid/devspace.yaml', 'packages/syft/src/syft/VERSION', 'packages/syft/setup.cfg', 'packages/grid/frontend/package.json', 'packages/syft/src/syft/__init__.py', 'packages/hagrid/hagrid/manifest_template.yml', 'packages/grid/helm/syft/Chart.yaml', 'packages/grid/helm/repo', 'packages/hagrid/hagrid/deps.py', 'packages/grid/podman/podman-kube/podman-syft-kube.yaml' , 'packages/syftcli/manifest.yml']"
 
       - name: Scheduled Build and Publish
@@ -137,7 +137,7 @@ jobs:
         with:
           repository: ${{ secrets.INFRA_REPO }}
           ref: "main"
-          token: ${{ secrets.OM_BOT_TOKEN }}
+          token: ${{ secrets.INFRA_BOT_COMMIT_TOKEN }}
           path: infrastructure
 
       # This step will copy the generated K8s manifest files to the correct directory in Infra repo
@@ -157,7 +157,7 @@ jobs:
           author_name: ${{ secrets.OM_BOT_NAME }}
           author_email: ${{ secrets.OM_BOT_EMAIL }}
           message: "Update K8s Manifests from Syft Repo"
-          add: "*"
+          add: "."
           push: "origin main"
           cwd: "./infrastructure/"
 
diff --git a/.github/workflows/cd-syftcli.yml b/.github/workflows/cd-syftcli.yml
index a8d7ac9eb22..63287f1532b 100644
--- a/.github/workflows/cd-syftcli.yml
+++ b/.github/workflows/cd-syftcli.yml
@@ -38,7 +38,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.SYFT_BUMP_TOKEN  }}
+          token: ${{ secrets.SYFT_BOT_COMMIT_TOKEN }}
 
       - name: Install checksumdir
         run: |
@@ -83,15 +83,14 @@ jobs:
         if: ${{steps.get-hashes.outputs.current_hash != steps.get-hashes.outputs.previous_hash }}
         run: echo $(checksumdir packages/syftcli/syftcli -e version.py) > ./scripts/syftcli_hash
 
-      - name: Commit changes
+      - name: Commit changes to Syft CLI
         if: ${{steps.get-hashes.outputs.current_hash != steps.get-hashes.outputs.previous_hash }}
-        uses: EndBug/add-and-commit@v7
+        uses: EndBug/add-and-commit@v9
         with:
-          author_name: Madhava Jay
-          author_email: madhava@openmined.org
-          message: "bump version"
+          author_name: ${{ secrets.OM_BOT_NAME }}
+          author_email: ${{ secrets.OM_BOT_EMAIL }}
+          message: "[syftcli]bump version"
           add: "['./packages/syftcli/.bumpversion.cfg','./packages/syftcli/setup.py','./packages/syftcli/syftcli/version.py', './scripts/syftcli_hash']"
-          pull_strategy: NO-PULL
 
       - name: Build and publish
         if: ${{steps.get-hashes.outputs.current_hash != steps.get-hashes.outputs.previous_hash }}
@@ -114,8 +113,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.SYFT_BUMP_TOKEN  }}
 
       - name: Set up Python
         uses: actions/setup-python@v3
@@ -152,8 +149,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.SYFT_BUMP_TOKEN  }}
 
       - name: Deployed Version
         run: echo ${{needs.deploy-syft-cli.outputs.deployed_version}}
diff --git a/.github/workflows/container-scan.yml b/.github/workflows/container-scan.yml
index 78d87c8fa49..a3e09f2aacd 100644
--- a/.github/workflows/container-scan.yml
+++ b/.github/workflows/container-scan.yml
@@ -19,6 +19,12 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      # free 10GB of space
+      - name: Remove unnecessary files
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+
       # Build the docker image for testing
       - name: Build a Docker image
         run: DOCKER_BUILDKIT=1 docker build -f packages/grid/backend/backend.dockerfile packages -t backend:${{ github.sha }} --no-cache
@@ -56,6 +62,12 @@ jobs:
           # This is where you will need to introduce the Snyk API token created with your Snyk account
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
 
+      # free 10GB of space
+      - name: Remove unnecessary files
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+
       # Build the docker image for testing
       - name: Build a Docker image
         shell: bash
@@ -524,7 +536,7 @@ jobs:
         continue-on-error: true
         uses: aquasecurity/trivy-action@master
         with:
-          image-ref: "seaweedfs:3.55"
+          image-ref: "chrislusf/seaweedfs:3.55"
           format: "cyclonedx"
           output: "seaweedfs-trivy-results.sbom.json"
           timeout: "10m0s"
@@ -541,7 +553,7 @@ jobs:
         continue-on-error: true
         uses: aquasecurity/trivy-action@master
         with:
-          image-ref: "seaweedfs:3.55"
+          image-ref: "chrislusf/seaweedfs:3.55"
           format: "sarif"
           output: "trivy-results.sarif"
           timeout: "10m0s"
diff --git a/.github/workflows/post-merge-cleanup-notebooks.yml b/.github/workflows/post-merge-cleanup-notebooks.yml
index b25d73e86ca..8b7f07ae4c3 100644
--- a/.github/workflows/post-merge-cleanup-notebooks.yml
+++ b/.github/workflows/post-merge-cleanup-notebooks.yml
@@ -15,16 +15,18 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.SYFT_BUMP_TOKEN }}
+          token: ${{ secrets.SYFT_BOT_COMMIT_TOKEN }}
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Commit changes
+
+      - name: Commit changes to remove notebooks
         uses: EndBug/add-and-commit@v9
         with:
-          author_name: Madhava Jay
-          author_email: madhava@openmined.org
+          author_name: ${{ secrets.OM_BOT_NAME }}
+          author_email: ${{ secrets.OM_BOT_EMAIL }}
           message: "cleanup notebooks"
           remove: "-r notebooks/Experimental/"
           commit: "-a"
diff --git a/.github/workflows/pr-tests-frontend.yml b/.github/workflows/pr-tests-frontend.yml
index d813983dc86..4a215141480 100644
--- a/.github/workflows/pr-tests-frontend.yml
+++ b/.github/workflows/pr-tests-frontend.yml
@@ -148,7 +148,7 @@ jobs:
         shell: bash
         run: |
           mkdir -p ~/.docker/cli-plugins
-          DOCKER_COMPOSE_VERSION=v2.16.0
+          DOCKER_COMPOSE_VERSION=v2.21.0
           curl -sSL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
           chmod +x ~/.docker/cli-plugins/docker-compose
 
diff --git a/.github/workflows/pr-tests-stack-arm64.yml b/.github/workflows/pr-tests-stack-arm64.yml
index 09df1420680..d29185523cc 100644
--- a/.github/workflows/pr-tests-stack-arm64.yml
+++ b/.github/workflows/pr-tests-stack-arm64.yml
@@ -70,7 +70,7 @@ jobs:
         shell: bash
         run: |
           mkdir -p ~/.docker/cli-plugins
-          DOCKER_COMPOSE_VERSION=v2.16.0
+          DOCKER_COMPOSE_VERSION=v2.21.0
           curl -sSL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
           chmod +x ~/.docker/cli-plugins/docker-compose
 
diff --git a/.github/workflows/pr-tests-stack-public.yml b/.github/workflows/pr-tests-stack-public.yml
index 6658e470b45..ea33c1f11bb 100644
--- a/.github/workflows/pr-tests-stack-public.yml
+++ b/.github/workflows/pr-tests-stack-public.yml
@@ -111,7 +111,7 @@ jobs:
         shell: bash
         run: |
           mkdir -p ~/.docker/cli-plugins
-          DOCKER_COMPOSE_VERSION=v2.16.0
+          DOCKER_COMPOSE_VERSION=v2.21.0
           curl -sSL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
           chmod +x ~/.docker/cli-plugins/docker-compose
 
diff --git a/.github/workflows/pr-tests-stack.yml b/.github/workflows/pr-tests-stack.yml
index 72e0003145d..b449aef57fa 100644
--- a/.github/workflows/pr-tests-stack.yml
+++ b/.github/workflows/pr-tests-stack.yml
@@ -123,7 +123,7 @@ jobs:
         shell: bash
         run: |
           mkdir -p ~/.docker/cli-plugins
-          DOCKER_COMPOSE_VERSION=v2.16.0
+          DOCKER_COMPOSE_VERSION=v2.21.0
           curl -sSL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
           chmod +x ~/.docker/cli-plugins/docker-compose
 
@@ -334,7 +334,7 @@ jobs:
         shell: bash
         run: |
           mkdir -p ~/.docker/cli-plugins
-          DOCKER_COMPOSE_VERSION=v2.16.0
+          DOCKER_COMPOSE_VERSION=v2.21.0
           curl -sSL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
           chmod +x ~/.docker/cli-plugins/docker-compose
 
diff --git a/.github/workflows/pr-tests-syft.yml b/.github/workflows/pr-tests-syft.yml
index 77a2ceeca6c..82e9a2b87f7 100644
--- a/.github/workflows/pr-tests-syft.yml
+++ b/.github/workflows/pr-tests-syft.yml
@@ -208,6 +208,14 @@ jobs:
       #   run: |
       #     sudo chown -R $USER:$USER $HOME
       - uses: actions/checkout@v3
+
+      # free 10GB of space
+      - name: Remove unnecessary files
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+
       - name: Check for file changes
         uses: dorny/paths-filter@v2
         id: changes
@@ -253,7 +261,7 @@ jobs:
         shell: bash
         run: |
           mkdir -p ~/.docker/cli-plugins
-          DOCKER_COMPOSE_VERSION=v2.16.0
+          DOCKER_COMPOSE_VERSION=v2.21.0
           curl -sSL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
           chmod +x ~/.docker/cli-plugins/docker-compose
           docker compose version
diff --git a/notebooks/Experimental/test.ipynb b/notebooks/Experimental/test.ipynb
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/packages/grid/devspace.yaml b/packages/grid/devspace.yaml
index 6bfebc6669b..5b150d2203c 100644
--- a/packages/grid/devspace.yaml
+++ b/packages/grid/devspace.yaml
@@ -20,14 +20,14 @@ pipelines:
 
 vars:
   DEVSPACE_ENV_FILE: "default.env"
-  CONTAINER_REGISTRY: "docker.io/"
+  CONTAINER_REGISTRY: "docker.io"
   VERSION: "0.8.2-beta.30"
 
 # This is a list of `images` that DevSpace can build for this project
 # We recommend to skip image building during development (devspace dev) as much as possible
 images:
   backend:
-    image: "${CONTAINER_REGISTRY}${DOCKER_IMAGE_BACKEND}"
+    image: "${CONTAINER_REGISTRY}/${DOCKER_IMAGE_BACKEND}"
     buildKit: {}
     dockerfile: ./backend/backend.dockerfile
     context: ../
@@ -35,7 +35,7 @@ images:
       - dev-latest
       - "${VERSION}"
   tailscale:
-    image: "${CONTAINER_REGISTRY}${DOCKER_IMAGE_TAILSCALE}"
+    image: "${CONTAINER_REGISTRY}/${DOCKER_IMAGE_TAILSCALE}"
     buildKit: {}
     dockerfile: ./vpn/tailscale.dockerfile
     context: ./vpn
@@ -43,7 +43,7 @@ images:
       - dev-latest
       - "${VERSION}"
   frontend:
-    image: "${CONTAINER_REGISTRY}${DOCKER_IMAGE_FRONTEND}"
+    image: "${CONTAINER_REGISTRY}/${DOCKER_IMAGE_FRONTEND}"
     buildKit:
       args: ["--target", "grid-ui-production"]
     dockerfile: ./frontend/frontend.dockerfile
@@ -83,7 +83,7 @@ deployments:
             env:
               - name: SERVICE_NAME
                 value: "proxy"
-          # - image: "${CONTAINER_REGISTRY}${DOCKER_IMAGE_TAILSCALE}:${VERSION}"
+          # - image: "${CONTAINER_REGISTRY}/${DOCKER_IMAGE_TAILSCALE}:${VERSION}"
           #   securityContext:
           #     capabilities:
           #       add: ["NET_ADMIN", "SYS_MODULE"]
@@ -123,7 +123,7 @@ deployments:
         version: "0.9.0"
       values:
         containers:
-          - image: "${CONTAINER_REGISTRY}${DOCKER_IMAGE_BACKEND}:${VERSION}"
+          - image: "${CONTAINER_REGISTRY}/${DOCKER_IMAGE_BACKEND}:${VERSION}"
             volumeMounts:
               - containerPath: /storage
                 volume:
@@ -228,7 +228,7 @@ deployments:
         version: "0.9.0"
       values:
         containers:
-          - image: "${CONTAINER_REGISTRY}${DOCKER_IMAGE_FRONTEND}:${VERSION}"
+          - image: "${CONTAINER_REGISTRY}/${DOCKER_IMAGE_FRONTEND}:${VERSION}"
             env:
               - name: VERSION
                 value: "${VERSION}"
@@ -249,7 +249,7 @@ dev:
     ports:
       - port: "27017"
   backend:
-    imageSelector: "${CONTAINER_REGISTRY}${DOCKER_IMAGE_BACKEND}"
+    imageSelector: "${CONTAINER_REGISTRY}/${DOCKER_IMAGE_BACKEND}"
     env:
       - name: DEV_MODE
         value: "True"
@@ -261,4 +261,4 @@ dev:
 commands:
   dev:
     command: |-
-      devspace --var CONTAINER_REGISTRY=k3d-registry.localhost:12345/ dev --config=devspace.yaml
+      devspace --var CONTAINER_REGISTRY=k3d-registry.localhost:12345 dev --config=devspace.yaml
diff --git a/packages/hagrid/.bumpversion.cfg b/packages/hagrid/.bumpversion.cfg
index 9d38890f4f1..b04a6814d13 100644
--- a/packages/hagrid/.bumpversion.cfg
+++ b/packages/hagrid/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.71
+current_version = 0.3.72
 tag = False
 tag_name = {new_version}
 commit = True
diff --git a/packages/hagrid/hagrid/deps.py b/packages/hagrid/hagrid/deps.py
index a4340faec5f..143e309e65b 100644
--- a/packages/hagrid/hagrid/deps.py
+++ b/packages/hagrid/hagrid/deps.py
@@ -48,7 +48,7 @@
 You are running an old version of docker, possibly on Linux. You need to install v2.
 At the time of writing this, if you are on linux you need to run the following:
 
-DOCKER_COMPOSE_VERSION=v2.16.0
+DOCKER_COMPOSE_VERSION=v2.21.0
 curl -sSL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 \
      -o ~/.docker/cli-plugins/docker-compose
 chmod +x ~/.docker/cli-plugins/docker-compose
@@ -770,7 +770,7 @@ def check_syft(
         "windows": "choco install docker-desktop -y",
         "linux": (
             "mkdir -p ~/.docker/cli-plugins\n"
-            + "DOCKER_COMPOSE_VERSION=v2.16.0\n"
+            + "DOCKER_COMPOSE_VERSION=v2.21.0\n"
             + "curl -sSL https://github.com/docker/compose/releases/download/"
             + "${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 "
             + "-o ~/.docker/cli-plugins/docker-compose\n"
diff --git a/packages/hagrid/hagrid/manifest_template.yml b/packages/hagrid/hagrid/manifest_template.yml
index 12730acbeba..0b517425623 100644
--- a/packages/hagrid/hagrid/manifest_template.yml
+++ b/packages/hagrid/hagrid/manifest_template.yml
@@ -1,9 +1,9 @@
 manifestVersion: 0.1
-hagrid_version: 0.3.71
+hagrid_version: 0.3.72
 syft_version: 0.8.2-beta.30
 dockerTag: 0.8.2-beta.30
 baseUrl: https://raw.githubusercontent.com/OpenMined/PySyft/
-hash: 8daa30a460b679585f4f6d0b9707bfc0110ca27a
+hash: f0d04c5e0a71295271f2fda2647a7bb9a0affe19
 target_dir: ~/.hagrid/PySyft/
 files:
   grid:
diff --git a/packages/hagrid/hagrid/version.py b/packages/hagrid/hagrid/version.py
index 5c26289f637..12026873d77 100644
--- a/packages/hagrid/hagrid/version.py
+++ b/packages/hagrid/hagrid/version.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # HAGrid Version
-__version__ = "0.3.71"
+__version__ = "0.3.72"
 
 if __name__ == "__main__":
     print(__version__)
diff --git a/packages/hagrid/setup.py b/packages/hagrid/setup.py
index 22eb365fdf6..49272db197b 100644
--- a/packages/hagrid/setup.py
+++ b/packages/hagrid/setup.py
@@ -5,7 +5,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-__version__ = "0.3.71"
+__version__ = "0.3.72"
 
 DATA_FILES = {"img": ["hagrid/img/*.png"], "hagrid": ["*.yml"]}
 
diff --git a/scripts/hagrid_hash b/scripts/hagrid_hash
index ba276c38159..effd467bb4e 100644
--- a/scripts/hagrid_hash
+++ b/scripts/hagrid_hash
@@ -1 +1 @@
-e32f2c4364e17407a56a8cf9fb828d5e
+8cfc7ab679fc789a602f5d694f35b37f
diff --git a/tox.ini b/tox.ini
index d0ed8ec06d1..bf4d310d705 100644
--- a/tox.ini
+++ b/tox.ini
@@ -624,7 +624,7 @@ commands =
     #     --var DOMAIN_NAME=$NODE_NAME \
     #     --var NETWORK_CHECK_INTERVAL=5 \
     #     --var TEST_MODE=1 \
-    #     --var CONTAINER_REGISTRY=k3d-registry.localhost:12345/ \
+    #     --var CONTAINER_REGISTRY=k3d-registry.localhost:12345 \
     #     build -b'
 
     # bash -c 'NODE_NAME=test-gateway-1 NODE_PORT=9081 && \
@@ -635,7 +635,7 @@ commands =
     #     --var NETWORK_CHECK_INTERVAL=5 \
     #     --var ASSOCIATION_TIMEOUT=100 \
     #     --var TEST_MODE=1 \
-    #     --var CONTAINER_REGISTRY=k3d-registry.localhost:12345/ \
+    #     --var CONTAINER_REGISTRY=k3d-registry.localhost:12345 \
     #     deploy -b -p gateway; \
     #     do ((--r))||exit;echo "retrying" && sleep 20;done)'
 
@@ -651,7 +651,7 @@ commands =
         --var DOMAIN_CHECK_INTERVAL=5 \
         --var ASSOCIATION_TIMEOUT=100 \
         --var TEST_MODE=1 \
-        --var CONTAINER_REGISTRY=k3d-registry.localhost:12345/ \
+        --var CONTAINER_REGISTRY=k3d-registry.localhost:12345 \
         deploy -b; \
         do ((--r))||exit;echo "retrying" && sleep 20;done)'
 
@@ -667,7 +667,7 @@ commands =
     #     --var DOMAIN_CHECK_INTERVAL=5 \
     #     --var ASSOCIATION_TIMEOUT=100 \
     #     --var TEST_MODE=1 \
-    #     --var CONTAINER_REGISTRY=k3d-registry.localhost:12345/ \
+    #     --var CONTAINER_REGISTRY=k3d-registry.localhost:12345 \
     #     deploy -b -p domain; \
     #     do ((--r))||exit;echo "retrying" && sleep 20;done)'
 
@@ -738,7 +738,7 @@ description = Build Helm Chart for Kubernetes
 deps =
     pyyaml
 changedir = {toxinidir}
-passenv=HOME, USER
+passenv=HOME, USER, CONTAINER_REGISTRY , VERSION
 allowlist_externals =
     devspace
     kubectl
@@ -763,7 +763,9 @@ commands =
     bash -c 'rm packages/grid/helm/syft/templates/* || true'
 
     bash -c 'cd packages/grid && \
-        devspace deploy --skip-build --no-warn --kube-context "k3d-build" --render 2>/dev/null | python3 helm/helm.py'
+        [[ -n "$CONTAINER_REGISTRY" ]] && REGISTRY_FLAG="--var CONTAINER_REGISTRY=$CONTAINER_REGISTRY" || REGISTRY_FLAG="" && \
+        [[ -n "$VERSION" ]] && VERSION_FLAG="--var VERSION=$VERSION" || VERSION_FLAG="" && \
+        devspace deploy --skip-build --no-warn ${REGISTRY_FLAG} ${VERSION_FLAG} --kube-context "k3d-build" --render 2>/dev/null | python3 helm/helm.py'
 
     bash -c 'cd packages/grid/helm && \
         helm lint syft'