diff --git a/Chart.yaml b/Chart.yaml
index 18ca9fb..f9eaf60 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -7,4 +7,5 @@ keywords:
   - tembo
 dependencies:
   - name: tembo
+    condition: global.temboEnabled
     version: 24.2.0
diff --git a/charts/tembo/values.yaml b/charts/tembo/values.yaml
index 063c9c1..9d92b01 100644
--- a/charts/tembo/values.yaml
+++ b/charts/tembo/values.yaml
@@ -55,29 +55,7 @@ conductor:
   nodeSelector: {}
   tolerations: []
   affinity: {}
-  env:
-    - name: PG_CONN_URL
-      valueFrom:
-        secretKeyRef:
-          name: control-plane-connection
-          key: rw_uri
-    - name: POSTGRES_QUEUE_CONNECTION
-      valueFrom:
-          secretKeyRef:
-            name: control-plane-queue-connection
-            key: rw_uri
-    - name: CONTROL_PLANE_EVENTS_QUEUE
-      value: saas_queue
-    - name: DATA_PLANE_EVENTS_QUEUE
-      value: data_plane_events
-    - name: DATA_PLANE_BASEDOMAIN
-      value: localhost
-    - name: BACKUP_ARCHIVE_BUCKET
-      value: tembo-enterprise
-    - name: CF_TEMPLATE_BUCKET
-      value: tembo-enterprise
-    - name: METRICS_EVENTS_QUEUE
-      value: metrics_events
+  env: []
 
 tembo-operator:
   # -- The controller configuration
@@ -558,7 +536,7 @@ temboUI:
 
   image:
     repository: quay.io/tembo/mahout-ui
-    tag: 0.0.1-alpha10
+    tag: 0.0.1-alpha11
     pullPolicy: IfNotPresent
 
   # We should reconfigure the defaults
diff --git a/values.yaml b/values.yaml
new file mode 100644
index 0000000..3975e50
--- /dev/null
+++ b/values.yaml
@@ -0,0 +1,48 @@
+global:
+  temboEnabled: true
+tembo:
+  conductor:
+    image:
+      tag: ent-test
+    env:
+      - name: PG_CONN_URL
+        valueFrom:
+          secretKeyRef:
+            name: control-plane-connection
+            key: rw_uri
+      - name: POSTGRES_QUEUE_CONNECTION
+        valueFrom:
+          secretKeyRef:
+            name: control-plane-queue-connection
+            key: rw_uri
+      - name: CONTROL_PLANE_EVENTS_QUEUE
+        value: saas_queue
+      - name: DATA_PLANE_EVENTS_QUEUE
+        value: data_plane_events
+      - name: DATA_PLANE_BASEDOMAIN
+        value: ~
+      - name: BACKUP_ARCHIVE_BUCKET
+        value: tembo-enterprise
+      - name: CF_TEMPLATE_BUCKET
+        value: tembo-enterprise
+      - name: METRICS_EVENTS_QUEUE
+        value: metrics_events
+  tembo-operator:
+    controller:
+      extraEnv:
+        - name: DATA_PLANE_BASEDOMAIN
+          value: ~
+  cpWebserver:
+    env:
+      - name: CLERK_SECRET_KEY
+        value: ~
+      - name: CLERK_WEBHOOK_SIGNING_SECRET
+        value: ~
+      - name: STRIPE_SECRET_KEY
+        value: ~
+      - name: STRIPE_WEBHOOK_SIGNING_SECRET
+        value: ~
+      - name: METRONOME_SECRET_KEY
+        value: ~
+      - name: DEFAULT_CONTAINER_REGISTRY
+        value: quay.io/tembo