diff --git a/Cargo.lock b/Cargo.lock
index 53e70c5..8de4880 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1136,7 +1136,7 @@ dependencies = [
 [[package]]
 name = "cuddle-clusters"
 version = "0.1.0"
-source = "git+https://git.front.kjuulh.io/kjuulh/cuddle-clusters?branch=main#4bbca2079783c24400b0641ba94ec4c5bde2b9cd"
+source = "git+https://git.front.kjuulh.io/kjuulh/cuddle-clusters?branch=main#616d23c5503c560e11dad655ac2400dd604e29f1"
 dependencies = [
  "anyhow",
  "clap",
diff --git a/crates/cuddle-rust-service-plan/src/main.rs b/crates/cuddle-rust-service-plan/src/main.rs
index 6967f82..c945fff 100644
--- a/crates/cuddle-rust-service-plan/src/main.rs
+++ b/crates/cuddle-rust-service-plan/src/main.rs
@@ -9,6 +9,7 @@ use cuddle_ci::rust_service::RustService;
 use cuddle_ci::rust_service::{extensions::*, RustServiceContext};
 use cuddle_ci::{Context, CuddleCI, MainAction, PullRequestAction};
 use cuddle_clusters::catalog::cluster_vars::ClusterVars;
+use cuddle_clusters::catalog::crdb_database::CockroachDB;
 use cuddle_clusters::catalog::cuddle_vars::CuddleVars;
 use cuddle_clusters::catalog::vault_secret::VaultSecret;
 use cuddle_clusters::releaser::Releaser;
@@ -76,6 +77,10 @@ impl RustServiceRender {
                     .into_component(),
                 ClusterVars::default().into_component(),
                 VaultSecret::default().into_component(),
+                CockroachDB::new(&std::env::current_dir()?)
+                    .await
+                    .map_err(|e| eyre::anyhow!("failed to get cuddle vars: {}", e.to_string()))?
+                    .into_component(),
             ],
             cuddle_clusters::process::ProcessOpts {
                 path: std::env::current_dir()?,
@@ -106,13 +111,13 @@ impl MainAction for RustServiceRender {
 
         self.render_templates(&image_tag).await?;
 
-        cuddle_ci::cuddle_x::well_known::render(vec![
-            "--cluster",
-            "clank-prod",
-            "--image_tag",
-            &image_tag,
-        ])
-        .await?;
+        // cuddle_ci::cuddle_x::well_known::render(vec![
+        //     "--cluster",
+        //     "clank-prod",
+        //     "--image_tag",
+        //     &image_tag,
+        // ])
+        // .await?;
 
         Ok(())
     }
diff --git a/templates/clusters/deployment.yaml.jinja2 b/templates/clusters/deployment.yaml.jinja2
index 3871d79..d33a40c 100644
--- a/templates/clusters/deployment.yaml.jinja2
+++ b/templates/clusters/deployment.yaml.jinja2
@@ -32,6 +32,25 @@ spec:
         envFrom:
         - configMapRef:
             name: {{service_name}}-config
+        {%- if vars.vault_secret.has_values or vars.cuddle_crdb.has_values %}
+        env:
+        {%- if vars.vault_secret.has_values  %}
+        {%- for secret in vars.vault_secret.secrets %}
+        - name: {{secret  | upper | replace(".", "_") | replace("-", "_") }}
+          valueFrom:
+            secretKeyRef:
+              name: {{ vars.vault_secret.file_name(service_name) }}
+              key: {{ secret }}
+        {%- endfor %}
+        {%- endif %}
+        {%- if vars.cuddle_crdb.has_values %}
+        - name: {{vars.cuddle_crdb.env }}
+          valueFrom:
+            secretKeyRef:
+              name: {{ vars.cuddle_crdb.file_name(service_name) }}
+              key: {{ vars.cuddle_crdb.env }}
+        {%- endif %}
+        {%- endif %}
         ports:
         - containerPort: 3000
           name: external-http