diff --git a/.github/workflows/custom-artifact.yml b/.github/workflows/custom-artifact.yml
index 74e6d3092..8dfb6bc25 100644
--- a/.github/workflows/custom-artifact.yml
+++ b/.github/workflows/custom-artifact.yml
@@ -2,8 +2,7 @@ on:
   push:
     branches: [master, develop]
     tags: [ v* ]
-  pull_request:
-    branches: [master, develop]
+  workflow_dispatch:
 jobs:
   offline:
     name: Prepare custom offline package
@@ -25,7 +24,7 @@ jobs:
         run: nix-env -f default.nix -iA env
 
       - name: Run offline build
-        run: ./offline/ci.sh HELM_CHART_EXCLUDE_LIST=elasticsearch-curator,fluent-bit,kibana,redis-cluster,inbucket,aws-ingress,backoffice,calling-test,nginx-ingress-controller,postgresql
+        run: ./offline/ci.sh HELM_CHART_EXCLUDE_LIST=elasticsearch-curator,fluent-bit,kibana,redis-cluster,inbucket,aws-ingress,backoffice,calling-test,nginx-ingress-controller
         env:
           GPG_PRIVATE_KEY: '${{ secrets.GPG_PRIVATE_KEY }}'
           DOCKER_LOGIN: '${{ secrets.DOCKER_LOGIN }}'
diff --git a/offline/ci.sh b/offline/ci.sh
index 5a7350a9c..c4da9c530 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -160,10 +160,6 @@ wire_build_chart_release () {
   | map("\(.key) \(.value.repo) \(.value.version)")
   | join("\n")
   '
-  # Will be removed once these are added to the build.json through helm-charts repo
-  echo "k8ssandra-operator https://helm.k8ssandra.io/stable 1.15.0"
-  echo "keycloakx https://codecentric.github.io/helm-charts 2.3.0"
-  echo "openebs https://openebs.github.io/charts 3.10.0"
 }
 
 
diff --git a/values/k8ssandra-operator/prod-values.example.yaml b/values/k8ssandra-operator/prod-values.example.yaml
index 81b5b37d2..c5c503775 100644
--- a/values/k8ssandra-operator/prod-values.example.yaml
+++ b/values/k8ssandra-operator/prod-values.example.yaml
@@ -1,14 +1,15 @@
-cass-operator:
-  disableCertManagerCheck: true
+k8ssandra-operator:
+  cass-operator:
+    disableCertManagerCheck: true
 
-cleaner:
-  image:
-    registry: docker.io
-    repository: k8ssandra/k8ssandra-tools
-    tag: 1.6.0-20240328143453-c6f39dad
+  cleaner:
+    image:
+      registry: docker.io
+      repository: k8ssandra/k8ssandra-tools
+      tag: 1.6.0-20240328143453-c6f39dad
 
-client:
-  image:
-    registry: docker.io
-    repository: k8ssandra/k8ssandra-tools
-    tag: 1.6.0-20240328143453-c6f39dad
+  client:
+    image:
+      registry: docker.io
+      repository: k8ssandra/k8ssandra-tools
+      tag: 1.6.0-20240328143453-c6f39dad