diff --git a/Cargo.lock b/Cargo.lock
index 58bdfdc..2db3926 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -307,7 +307,7 @@ dependencies = [
 [[package]]
 name = "cuddle-ci"
 version = "0.2.0"
-source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#4f15e5a88779b626f229c124b3d3df656a4597de"
+source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#f4e7ced9d89ee1753c0cac12d77df9c20d135fab"
 dependencies = [
  "async-trait",
  "chrono",
@@ -340,12 +340,12 @@ dependencies = [
 [[package]]
 name = "dagger-components"
 version = "0.1.0"
-source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#4f15e5a88779b626f229c124b3d3df656a4597de"
+source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#f4e7ced9d89ee1753c0cac12d77df9c20d135fab"
 
 [[package]]
 name = "dagger-cuddle-please"
 version = "0.2.0"
-source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#4f15e5a88779b626f229c124b3d3df656a4597de"
+source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#f4e7ced9d89ee1753c0cac12d77df9c20d135fab"
 dependencies = [
  "async-trait",
  "dagger-sdk",
@@ -355,7 +355,7 @@ dependencies = [
 [[package]]
 name = "dagger-rust"
 version = "0.2.0"
-source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#4f15e5a88779b626f229c124b3d3df656a4597de"
+source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#f4e7ced9d89ee1753c0cac12d77df9c20d135fab"
 dependencies = [
  "async-trait",
  "dagger-sdk",
diff --git a/ci/src/main.rs b/ci/src/main.rs
index 109c304..49b8608 100644
--- a/ci/src/main.rs
+++ b/ci/src/main.rs
@@ -1,10 +1,13 @@
 use std::sync::Arc;
 
+use cuddle_ci::drone_templater::DroneTemplater;
 use cuddle_ci::rust_service::architecture::{Architecture, Os};
 use cuddle_ci::rust_service::{extensions::*, RustService};
 use cuddle_ci::{drone_templater, CuddleCI};
 use tokio::sync::Mutex;
 
+const BIN_NAME: &str = "cuddle-rust-cli-plan";
+
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
     let client = dagger_sdk::connect().await?;
@@ -27,16 +30,17 @@ async fn main() -> eyre::Result<()> {
         .with_apt_ca_certificates()
         .with_crates(["ci", "crates/*"])
         .with_mold("2.3.3")
-        .with_bin_name("cuddle-rust-cli-plan")
+        .with_bin_name(BIN_NAME)
         .with_deployment(false)
         .to_owned();
 
     let service = Arc::new(Mutex::new(service));
 
-    let drone_templater = Arc::new(Mutex::new(drone_templater::DroneTemplater::new(
-        client,
-        "templates/cuddle-rust-cli-plan.yaml",
-    )));
+    let drone_templater = Arc::new(Mutex::new(
+        DroneTemplater::new(client, "templates/cuddle-rust-cli-plan.yaml")
+            .with_variable("bin_name", BIN_NAME)
+            .to_owned(),
+    ));
 
     CuddleCI::default()
         .with_pull_request(service.clone())
diff --git a/templates/cuddle-rust-cli-plan.yaml b/templates/cuddle-rust-cli-plan.yaml
index 5d71741..e306dfc 100644
--- a/templates/cuddle-rust-cli-plan.yaml
+++ b/templates/cuddle-rust-cli-plan.yaml
@@ -26,8 +26,7 @@ steps:
       - chmod 700 ~/.ssh/config
 
   - name: build pr
-    image: kasperhermansen/cuddle-rust-cli-plan:{{image_tag}}
-    pull: always
+    image: kasperhermansen/{{bin_name}}:{{image_tag}}
     volumes:
       - name: ssh
         path: /root/.ssh/
@@ -37,7 +36,7 @@ steps:
       - echo "$DOCKER_PASSWORD" | docker login  --password-stdin --username="$DOCKER_USERNAME" docker.io
       - export CLUSTER=clank-dev
       - cuddle --version
-      - cuddle-rust-cli-plan pr
+      - {{ bin_name }} pr
     environment:
       DAGGER_CLOUD_TOKEN:
         from_secret: dagger_cloud_token
@@ -79,8 +78,7 @@ steps:
       - "load_secret"
 
   - name: build main
-    image: kasperhermansen/cuddle-rust-cli-plan:{{image_tag}}
-    pull: always
+    image: kasperhermansen/{{bin_name}}:{{image_tag}}
     volumes:
       - name: ssh
         path: /root/.ssh/
@@ -90,7 +88,7 @@ steps:
       - echo "$DOCKER_PASSWORD" | docker login  --password-stdin --username="$DOCKER_USERNAME" docker.io
       - export CLUSTER=clank-prod
       - cuddle --version
-      - cuddle-rust-cli-plan main
+      - {{ bin_name }} main
     environment:
       DAGGER_CLOUD_TOKEN:
         from_secret: dagger_cloud_token