diff --git a/peerdb-catalog/.helmignore b/peerdb-catalog/.helmignore
index 5faa641..19edb86 100644
--- a/peerdb-catalog/.helmignore
+++ b/peerdb-catalog/.helmignore
@@ -21,4 +21,6 @@
 .idea/
 *.tmproj
 .vscode/
-peerdb-pg-setup
\ No newline at end of file
+pgSetup/peerdb-pg-setup
+images/
+pgSetup/pgSetup
diff --git a/peerdb-catalog/README.md b/peerdb-catalog/README.md
index 2ee614b..4bde8cb 100644
--- a/peerdb-catalog/README.md
+++ b/peerdb-catalog/README.md
@@ -95,7 +95,7 @@ A Helm chart for Kubernetes
 | schema.update.hook.type | string | `"pre-upgrade"` |  |
 | temporal.admintools.image.pullPolicy | string | `"IfNotPresent"` |  |
 | temporal.admintools.image.repository | string | `"temporalio/admin-tools"` |  |
-| temporal.admintools.image.tag | string | `"1.24.2"` | This should be set from the helm values for temporal dependency from the main chart |
+| temporal.admintools.image.tag | string | `"1.24.2.1-tctl-1.18.1-cli-0.13.2"` | This should be set from the helm values for temporal dependency from the main chart |
 | temporal.deploy.enabled | bool | `true` |  |
 | temporal.tls.enabled | string | `"_TEMPORAL_SSL_MODE_"` |  |
 
diff --git a/peerdb-catalog/pgSetup/pgSetup b/peerdb-catalog/pgSetup/pgSetup
deleted file mode 100755
index c17c72a..0000000
Binary files a/peerdb-catalog/pgSetup/pgSetup and /dev/null differ
diff --git a/peerdb-catalog/values.yaml b/peerdb-catalog/values.yaml
index f8d70fa..3f7edb7 100644
--- a/peerdb-catalog/values.yaml
+++ b/peerdb-catalog/values.yaml
@@ -128,7 +128,7 @@ temporal:
     image:
       repository: temporalio/admin-tools
       # -- This should be set from the helm values for temporal dependency from the main chart
-      tag: 1.24.2
+      tag: 1.24.2.1-tctl-1.18.1-cli-0.13.2
       pullPolicy: IfNotPresent
 
 
diff --git a/peerdb/README.md b/peerdb/README.md
index 70ebd84..556a3e8 100644
--- a/peerdb/README.md
+++ b/peerdb/README.md
@@ -225,6 +225,7 @@ Install PeerDB along with Temporal.
 | temporal-deploy.grafana.enabled | bool | `false` |  |
 | temporal-deploy.mysql.enabled | bool | `false` |  |
 | temporal-deploy.prometheus.enabled | bool | `false` |  |
+| temporal-deploy.schema.createDatabase.enabled | bool | `false` |  |
 | temporal-deploy.schema.setup.enabled | bool | `false` |  |
 | temporal-deploy.schema.update.enabled | bool | `false` |  |
 | temporal-deploy.server.config.persistence.default.driver | string | `"sql"` |  |
diff --git a/peerdb/values.yaml b/peerdb/values.yaml
index 4653220..a21baf5 100644
--- a/peerdb/values.yaml
+++ b/peerdb/values.yaml
@@ -576,6 +576,8 @@ temporal-deploy:
       enabled: false
     update:
       enabled: false
+    createDatabase:
+      enabled: false
 
 datadog:
   # -- Whether to deploy datadog, pulled from `DATADOG_ENABLED` from .env