diff --git a/Cargo.lock b/Cargo.lock
index 4d3527d..0215dee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -335,7 +335,7 @@ dependencies = [
 [[package]]
 name = "cuddle-clusters"
 version = "0.1.0"
-source = "git+https://git.front.kjuulh.io/kjuulh/cuddle-clusters?tag=v0.1.1#10a56ad69062776f24f853996b9eeb2da49dec4a"
+source = "git+https://git.front.kjuulh.io/kjuulh/cuddle-clusters?branch=main#545439923f384585c791bfb767b183192e0b1a0e"
 dependencies = [
  "anyhow",
  "clap",
diff --git a/Cargo.toml b/Cargo.toml
index 1f5c449..7429296 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,4 +11,4 @@ tracing-subscriber = { version = "0.3.18" }
 clap = { version = "4.5.4", features = ["derive", "env"] }
 dotenv = { version = "0.15.0" }
 
-cuddle-clusters = { git = "https://git.front.kjuulh.io/kjuulh/cuddle-clusters", tag = "v0.1.1" }
+cuddle-clusters = { git = "https://git.front.kjuulh.io/kjuulh/cuddle-clusters", branch = "main" } #tag = "v0.1.1" }
diff --git a/crates/cuddle-rust-service-plan/src/main.rs b/crates/cuddle-rust-service-plan/src/main.rs
index fd96f15..839f2cd 100644
--- a/crates/cuddle-rust-service-plan/src/main.rs
+++ b/crates/cuddle-rust-service-plan/src/main.rs
@@ -1,5 +1,3 @@
-use std::sync::Arc;
-
 use async_trait::async_trait;
 use cuddle_ci::cuddle_file::CuddleFile;
 use cuddle_ci::cuddle_releaser::CuddleReleaser;
@@ -7,7 +5,6 @@ use cuddle_ci::rust_service::architecture::{Architecture, Os};
 use cuddle_ci::rust_service::RustService;
 use cuddle_ci::rust_service::{extensions::*, RustServiceContext};
 use cuddle_ci::{Context, CuddleCI, MainAction, PullRequestAction};
-use tokio::sync::Mutex;
 
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
@@ -47,20 +44,20 @@ async fn main() -> eyre::Result<()> {
 #[derive(Default, Clone)]
 struct RustServiceRender {}
 
+impl RustServiceRender {
+    async fn render_templates(&self) -> eyre::Result<()> {
+        cuddle_clusters::process()
+            .await
+            .map_err(|e| eyre::anyhow!("failed to process templates: {}", e.to_string()))?;
+
+        Ok(())
+    }
+}
+
 #[async_trait]
 impl MainAction for RustServiceRender {
     async fn execute_main(&self, ctx: &mut Context) -> eyre::Result<()> {
-        let image_tag = ctx
-            .get_image_tag()?
-            .ok_or(eyre::anyhow!("failed to find image_tag"))?;
-
-        cuddle_ci::cuddle_x::well_known::render(vec![
-            "--cluster",
-            "clank-prod",
-            "--image_tag",
-            &image_tag,
-        ])
-        .await?;
+        self.render_templates().await?;
 
         Ok(())
     }
@@ -69,17 +66,7 @@ impl MainAction for RustServiceRender {
 #[async_trait]
 impl PullRequestAction for RustServiceRender {
     async fn execute_pull_request(&self, ctx: &mut Context) -> eyre::Result<()> {
-        let image_tag = ctx
-            .get_image_tag()?
-            .ok_or(eyre::anyhow!("failed to find image_tag"))?;
-
-        cuddle_ci::cuddle_x::well_known::render(vec![
-            "--cluster",
-            "clank-dev",
-            "--image_tag",
-            &image_tag,
-        ])
-        .await?;
+        self.render_templates().await?;
 
         Ok(())
     }