diff --git a/crates/cuddle-clusters/src/catalog/cuddle_vars.rs b/crates/cuddle-clusters/src/catalog/cuddle_vars.rs
index 4fbc26d..8694a30 100644
--- a/crates/cuddle-clusters/src/catalog/cuddle_vars.rs
+++ b/crates/cuddle-clusters/src/catalog/cuddle_vars.rs
@@ -84,7 +84,7 @@ pub struct CuddleVars {
     pub variables: CuddleVariables,
 }
 
-const PARENT_PLAN_PREFIX: &str = ".cuddle/plan";
+const PARENT_PLAN_PREFIX: &str = ".cuddle/base";
 const CUDDLE_FILE: &str = "cuddle.yaml";
 
 impl CuddleVars {
diff --git a/crates/cuddle-clusters/src/process.rs b/crates/cuddle-clusters/src/process.rs
index 141cf90..c40a751 100644
--- a/crates/cuddle-clusters/src/process.rs
+++ b/crates/cuddle-clusters/src/process.rs
@@ -34,7 +34,7 @@ impl Default for ProcessOpts {
 }
 
 const TEMPLATES_PATH_PREFIX: &str = "templates/clusters";
-const CUDDLE_PLAN_PATH_PREFIX: &str = ".cuddle/plan";
+const CUDDLE_PLAN_PATH_PREFIX: &str = ".cuddle/base";
 
 pub async fn process_opts(
     components: impl IntoIterator<Item = impl IntoComponent>,
diff --git a/crates/cuddle-clusters/tests/with_actual_deployment/.cuddle/plan/templates/clusters/configmap.yaml.jinja2 b/crates/cuddle-clusters/tests/with_actual_deployment/.cuddle/plan/templates/clusters/configmap.yaml.jinja2
deleted file mode 100644
index 591956a..0000000
--- a/crates/cuddle-clusters/tests/with_actual_deployment/.cuddle/plan/templates/clusters/configmap.yaml.jinja2
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ vars.cuddle_vars.service }}-config
-data:
-  {%- if (vars.cluster_vars.env | items | length) > 0  %}
-  environment:
-  {%- for (name, value) in vars.cluster_vars.env  | dictsort   %}
-    {{name  | upper | replace(".", "_") | replace("-", "_") }}: {{value}}
-  {%- endfor %}
-  {%- endif %}
diff --git a/crates/cuddle-clusters/tests/with_actual_deployment/.cuddle/plan/templates/clusters/deployment.yaml.jinja2 b/crates/cuddle-clusters/tests/with_actual_deployment/.cuddle/plan/templates/clusters/deployment.yaml.jinja2
deleted file mode 100644
index a00e24c..0000000
--- a/crates/cuddle-clusters/tests/with_actual_deployment/.cuddle/plan/templates/clusters/deployment.yaml.jinja2
+++ /dev/null
@@ -1,41 +0,0 @@
-{%- set service_name = vars.cuddle_vars.service -%}
-{%- set cluster_name = vars.cluster_vars.name -%}
-{%- set cluster_namespace = vars.cluster_vars.namespace -%}
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: {{ service_name }}
-    cluster: {{ cluster_name }}
-  name: {{ service_name }}
-  namespace: {{ cluster_namespace }}
-spec:
-  replicas: 3
-  selector:
-    matchLabels:
-      app: {{ service_name }}
-      cluster: {{ cluster_name }}
-  template:
-    metadata:
-      labels:
-        app: {{ service_name }}
-        cluster: {{ cluster_name }}
-    spec:
-      containers:
-      - args:
-        - serve
-        command:
-        - {{ service_name }}
-        image: kasperhermansen/{{ service_name }}:main-1715336504
-        name: {{ service_name }}
-        envFrom:
-        - configMapRef:
-            name: {{service_name}}-config
-        ports:
-        - containerPort: 3000
-          name: external-http
-        - containerPort: 3001
-          name: internal-http
-        - containerPort: 3002
-          name: internal-grpc