diff --git a/.github/workflows/pr-cleanup.yml b/.github/workflows/pr-cleanup.yml
index fd594d43bb39a..e7bca8d22bc6a 100644
--- a/.github/workflows/pr-cleanup.yml
+++ b/.github/workflows/pr-cleanup.yml
@@ -10,6 +10,7 @@ jobs:
     deploy_preview_cleanup:
         name: Deploy Preview Cleanup
         runs-on: ubuntu-latest
+        if: ${{ contains(github.event.pull_request.labels.*.name, 'deploy') }}
 
         permissions:
             id-token: write
@@ -17,12 +18,6 @@ jobs:
             deployments: write
 
         steps:
-            - name: Checkout chart
-              uses: actions/checkout@v3
-              with:
-                  repository: posthog/charts-clickhouse
-                  path: charts-clickhouse
-
             - name: Checkout
               uses: actions/checkout@v3
               with:
@@ -34,6 +29,10 @@ jobs:
                   role-to-assume: arn:aws:iam::169684386827:role/github-terraform-infra-role
                   role-duration-seconds: 3600
 
+            - name: Login to Amazon ECR
+              id: aws-ecr
+              uses: aws-actions/amazon-ecr-login@v1
+
             - name: connect to tailscale
               uses: tailscale/github-action@8b804aa882ac3429b804a2a22f9803a2101a0db9
               env:
@@ -43,18 +42,26 @@ jobs:
                   authkey: ${{ secrets.TAILSCALE_OAUTH_SECRET }}
                   args: --advertise-tags tag:github-runner
 
-            - name: Delete preview deployment
+            - name: Delete hobby deployment
               id: cleanup
               run: |
-                  aws eks update-kubeconfig --name "posthog-dev"
-                  kubectl config set-cluster arn:aws:eks:us-east-1:169684386827:cluster/posthog-dev --server=https://eks-posthog-dev --tls-server-name 8BD6E1D2FEBDE47C8177E29CAC9E6C61.gr7.us-east-1.eks.amazonaws.com
+                aws eks update-kubeconfig --name "posthog-dev"
+                kubectl config set-cluster arn:aws:eks:us-east-1:169684386827:cluster/posthog-dev --server=https://eks-posthog-dev --tls-server-name 8BD6E1D2FEBDE47C8177E29CAC9E6C61.gr7.us-east-1.eks.amazonaws.com
+
+                export PR_NUM=${{ github.event.number }}
+                export BRANCH_NAME=${{ github.head_ref }}
+                export BRANCH_NAME_HASH=$(echo -n ${{ github.head_ref }} | md5sum | cut -c 1-8)
+                export HOSTNAME=pr-$PR_NUM-${BRANCH_NAME_HASH}
+                export HOSTNAME=${HOSTNAME:0:38}
+                export HOSTNAME=${HOSTNAME%%-}
+                export NAMESPACE="hobby"
+                export REGISTRY_URL=${{ steps.aws-ecr.outputs.registry }}/pr-test
+                export DOCKER_TAG=${{ github.event.pull_request.head.sha }}
 
-                  export PR_NUM=${{ github.event.number }}
-                  export BRANCH_NAME=${{ github.head_ref }}
-                  export NAMESPACE=pr-$PR_NUM-${BRANCH_NAME//\//-}
+                envsubst < posthog/.github/pr-deploy/hobby.yaml.tmpl > posthog/.github/pr-deploy/hobby.yaml
 
-                  kubectl -n $NAMESPACE delete clickhouseinstallations.clickhouse.altinity.com/posthog || true
-                  kubectl delete namespace $NAMESPACE || true
+                #Clean and deploy
+                kubectl -n $NAMESPACE delete -f posthog/.github/pr-deploy/hobby.yaml || true
 
             - name: delete deployment
               uses: bobheadxi/deployments@v1.4.0