diff --git a/dt/uni06zeta/kustomization.yaml b/dt/uni06zeta/kustomization.yaml
index 00c749b56..57f0e8b1c 100644
--- a/dt/uni06zeta/kustomization.yaml
+++ b/dt/uni06zeta/kustomization.yaml
@@ -26,9 +26,6 @@ transformers:
 components:
   - ../../lib/control-plane
 
-resources:
-  - networking/resources/octavia-network-attachment-definition.yaml
-
 replacements:
   - source:
       kind: ConfigMap
@@ -256,3 +253,15 @@ replacements:
           - spec.neutron.template.customServiceConfig
         options:
           create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.heat.enabled
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.heat.enabled
+        options:
+          create: true
diff --git a/dt/uni06zeta/networking/kustomization.yaml b/dt/uni06zeta/networking/kustomization.yaml
index 14d05ef6d..0024ee25b 100644
--- a/dt/uni06zeta/networking/kustomization.yaml
+++ b/dt/uni06zeta/networking/kustomization.yaml
@@ -21,7 +21,7 @@ components:
   - ../../../lib/networking/nad
 
 resources:
-  - resources/octavia-network-attachment-definition.yaml
+  - nad.yaml
 
 replacements:
   - source:
diff --git a/dt/uni06zeta/networking/resources/octavia-network-attachment-definition.yaml b/dt/uni06zeta/networking/nad.yaml
similarity index 100%
rename from dt/uni06zeta/networking/resources/octavia-network-attachment-definition.yaml
rename to dt/uni06zeta/networking/nad.yaml
diff --git a/examples/dt/uni06zeta/control-plane/networking/kustomization.yaml b/examples/dt/uni06zeta/control-plane/networking/kustomization.yaml
index d73e187a1..6f3c32d77 100644
--- a/examples/dt/uni06zeta/control-plane/networking/kustomization.yaml
+++ b/examples/dt/uni06zeta/control-plane/networking/kustomization.yaml
@@ -3,7 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 components:
-  - ../../../../../dt/uni06zeta/networking/
+  - ../../../../../dt/uni06zeta/networking
 
 resources:
   - nncp/values.yaml
diff --git a/examples/dt/uni06zeta/control-plane/networking/nncp/kustomization.yaml b/examples/dt/uni06zeta/control-plane/networking/nncp/kustomization.yaml
index af88172c4..577fe4cd9 100644
--- a/examples/dt/uni06zeta/control-plane/networking/nncp/kustomization.yaml
+++ b/examples/dt/uni06zeta/control-plane/networking/nncp/kustomization.yaml
@@ -2,20 +2,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-transformers:
-  - |-
-    apiVersion: builtin
-    kind: NamespaceTransformer
-    metadata:
-      name: _ignored_
-      namespace: openstack
-    setRoleBindingSubjects: none
-    unsetOnly: true
-    fieldSpecs:
-      - path: metadata/name
-        kind: Namespace
-        create: true
-
 components:
   - ../../../../../../dt/uni06zeta/nncp
 
diff --git a/examples/dt/uni06zeta/control-plane/service-values.yaml b/examples/dt/uni06zeta/control-plane/service-values.yaml
index ca223d868..3007e4800 100644
--- a/examples/dt/uni06zeta/control-plane/service-values.yaml
+++ b/examples/dt/uni06zeta/control-plane/service-values.yaml
@@ -62,8 +62,11 @@ data:
   swift:
     enabled: true
 
+  heat:
+    enabled: true
+
   octavia:
-    enabled: false
+    enabled: true
     amphoraImageContainerImage: quay.io/gthiemonge/octavia-amphora-image
     apacheContainerImage: registry.redhat.io/ubi9/httpd-24:latest
     availabilityZones: