diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml
index 806f20ce3..ad95062e7 100644
--- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml
+++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml
@@ -17,17 +17,19 @@ spec:
         - 192.168.122.1
       replicas: 1
   cinder:
+    enabled: false
     template:
       databaseInstance: openstack
       secret: osp-secret
       cinderAPI:
+        replicas: 0
         externalEndpoints:
         - endpoint: internal
           ipAddressPool: internalapi
           loadBalancerIPs:
           - 172.17.0.80
       cinderScheduler:
-        replicas: 1
+        replicas: 0
       cinderBackup:
         networkAttachments:
         - storage
@@ -41,8 +43,9 @@ spec:
     template:
       databaseInstance: openstack
       storageClass: ""
-      storageRequest: 10G
+      storageRequest: 1G
       glanceAPIInternal:
+        replicas: 1
         externalEndpoints:
         - endpoint: internal
           ipAddressPool: internalapi
@@ -51,6 +54,7 @@ spec:
         networkAttachments:
         - storage
       glanceAPIExternal:
+        replicas: 0
         networkAttachments:
         - storage
   keystone:
@@ -96,12 +100,52 @@ spec:
       networkAttachments:
       - internalapi
   horizon:
+    enabled: false
     template:
-      replicas: 1
+      replicas: 0
       secret: osp-secret
   nova:
+    enabled: true # install CRDs, run nothing (for local debug)
     template:
+      # This creates a collapsed cell deployment same as what OSP17 does by
+      # default. The conductor in cell1 acts as both the cell conductor and the
+      # super conductor hence cell0 conductor is disabled. Also in this
+      # deployment both the top level services and cell1 service will share the
+      # same message bus and database service instance so there is no cell
+      # separation implemented.
+      cellTemplates:
+          cell0:
+            cellDatabaseUser: nova_cell0
+            noVNCProxyServiceTemplate:
+              replicas: 0 # must remain 0?
+            metadataServiceTemplate:
+              replicas: 0 # must remain 0?
+            conductorServiceTemplate:
+              replicas: 0 # must remain 0
+            externalEndpoints:
+            - endpoint: internal
+              ipAddressPool: internalapi
+              loadBalancerIPs:
+              - 172.17.0.80
+            hasAPIAccess: true
+          cell1:
+            cellDatabaseUser: nova_cell1
+            cellDatabaseInstance: openstack-cell1
+            cellMessageBusInstance: rabbitmq-cell1
+            noVNCProxyServiceTemplate:
+              replicas: 0 #1, to be started locally
+            metadataServiceTemplate:
+              replicas: 0 #1, to be started locally
+            conductorServiceTemplate:
+              replicas: 0 #1, to be started locally
+            hasAPIAccess: true
+            externalEndpoints:
+            - endpoint: internal
+              ipAddressPool: internalapi
+              loadBalancerIPs:
+              - 172.17.0.80
       apiServiceTemplate:
+        replicas: 0 #1, to be started locally
         externalEndpoints:
         - endpoint: internal
           ipAddressPool: internalapi
@@ -109,15 +153,21 @@ spec:
           - 172.17.0.80
       secret: osp-secret
       metadataServiceTemplate:
+        replicas: 0 #1, to be started locally
         externalEndpoints:
          - endpoint: internal
            ipAddressPool: internalapi
            loadBalancerIPs:
            - 172.17.0.80
+      schedulerServiceTemplate:
+        replicas: 0 #1, to be started locally
+      noVNCProxyServiceTemplate:
+        replicas: 0 #1, to be started locally, or just for cell1?
   manila:
+    enabled: false
     template:
       manilaAPI:
-        replicas: 1
+        replicas: 0
         externalEndpoints:
         - endpoint: internal
           ipAddressPool: internalapi
@@ -126,32 +176,39 @@ spec:
         networkAttachments:
         - internalapi
       manilaScheduler:
-        replicas: 1
+        replicas: 0
+        networkAttachments:
+        - internalapi
       manilaShares:
         share1:
-          replicas: 1
+          replicas: 0
           networkAttachments:
           - storage
   ovn:
     template:
       ovnDBCluster:
         ovndbcluster-nb:
+          replicas: 1
           dbType: NB
-          storageRequest: 10G
+          storageRequest: 1G
           networkAttachment: internalapi
         ovndbcluster-sb:
+          replicas: 1
           dbType: SB
-          storageRequest: 10G
+          storageRequest: 1G
           networkAttachment: internalapi
       ovnNorthd:
+        replicas: 1
         networkAttachment: internalapi
       ovnController:
+        replicas: 1
         external-ids:
           system-id: "random"
           ovn-bridge: "br-int"
           ovn-encap-type: "geneve"
         networkAttachment: tenant
   placement:
+    enabled: false # for adoption testing
     template:
       databaseInstance: openstack
       secret: osp-secret
@@ -163,12 +220,28 @@ spec:
   rabbitmq:
     templates:
       rabbitmq:
+        replicas: 1
+        resources:
+          requests:
+            cpu: 150m
+            memory: 250Mi
+          limits:
+            cpu: 300m
+            memory: 500Mi
         externalEndpoint:
           loadBalancerIPs:
           - 172.17.0.85
           ipAddressPool: internalapi
           sharedIP: false
       rabbitmq-cell1:
+        replicas: 1
+        resources:
+          requests:
+            cpu: 150m
+            memory: 250Mi
+          limits:
+            cpu: 300m
+            memory: 500Mi
         externalEndpoint:
           loadBalancerIPs:
           - 172.17.0.86
@@ -179,43 +252,46 @@ spec:
     template:
       databaseInstance: openstack
       heatAPI:
-        replicas: 1
+        replicas: 0
       heatEngine:
-        replicas: 1
+        replicas: 0
+      heatCfnAPI:
+        replicas: 0
       secret: osp-secret
   ironic:
     enabled: false
     template:
       databaseInstance: openstack
       ironicAPI:
-        replicas: 1
+        replicas: 0
       ironicConductors:
-      - replicas: 1
-        storageRequest: 10G
+      - replicas: 0
+        storageRequest: 1G
       ironicInspector:
-        replicas: 1
+        replicas: 0
       ironicNeutronAgent:
-        replicas: 1
+        replicas: 0
       secret: osp-secret
   ceilometer:
+    enabled: false
     template:
       passwordSelector:
         service: CeilometerPassword
       secret: osp-secret
       serviceUser: ceilometer
   swift:
-    enabled: true
+    enabled: false
     template:
       swiftRing:
-        ringReplicas: 1
+        ringReplicas: 1 # can't be 0
       swiftStorage:
-        replicas: 1
+        replicas: 1 # can't be 0
       swiftProxy:
-        replicas: 1
+        replicas: 1 # can't be 0
   octavia:
     enabled: false
     template:
       databaseInstance: openstack
       octaviaAPI:
-        replicas: 1
+        replicas: 0
       secret: osp-secret
diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml
index b618dfe21..ead8239d5 100644
--- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml
+++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml
@@ -17,17 +17,19 @@ spec:
         - 192.168.122.1
       replicas: 1
   cinder:
+    enabled: false
     template:
       databaseInstance: openstack
       secret: osp-secret
       cinderAPI:
+        replicas: 0
         externalEndpoints:
         - endpoint: internal
           ipAddressPool: internalapi
           loadBalancerIPs:
           - 172.17.0.80
       cinderScheduler:
-        replicas: 1
+        replicas: 0
       cinderBackup:
         networkAttachments:
         - storage
@@ -41,8 +43,9 @@ spec:
     template:
       databaseInstance: openstack
       storageClass: ""
-      storageRequest: 10G
+      storageRequest: 1G
       glanceAPIInternal:
+        replicas: 1
         externalEndpoints:
         - endpoint: internal
           ipAddressPool: internalapi
@@ -51,6 +54,7 @@ spec:
         networkAttachments:
         - storage
       glanceAPIExternal:
+        replicas: 0
         networkAttachments:
         - storage
   keystone:
@@ -63,6 +67,25 @@ spec:
         loadBalancerIPs:
         - 172.17.0.80
   mariadb:
+    enabled: false
+    templates:
+      openstack:
+        storageRequest: 500M
+      openstack-cell1:
+        storageRequest: 500M
+  galera:
+    enabled: false
+    templates:
+      openstack:
+        storageRequest: 500M
+        secret: osp-secret
+        replicas: 1
+      openstack-cell1:
+        storageRequest: 500M
+        secret: osp-secret
+        replicas: 1
+  mariadb:
+    enabled: true
     templates:
       openstack:
         storageRequest: 500M
@@ -84,12 +107,52 @@ spec:
       networkAttachments:
       - internalapi
   horizon:
+    enabled: false
     template:
-      replicas: 1
+      replicas: 0
       secret: osp-secret
   nova:
+    enabled: true # install CRDs, run nothing (for local debug)
     template:
+      # This creates a collapsed cell deployment same as what OSP17 does by
+      # default. The conductor in cell1 acts as both the cell conductor and the
+      # super conductor hence cell0 conductor is disabled. Also in this
+      # deployment both the top level services and cell1 service will share the
+      # same message bus and database service instance so there is no cell
+      # separation implemented.
+      cellTemplates:
+          cell0:
+            cellDatabaseUser: nova_cell0
+            noVNCProxyServiceTemplate:
+              replicas: 0 # must remain 0?
+            metadataServiceTemplate:
+              replicas: 0 # must remain 0?
+            conductorServiceTemplate:
+              replicas: 0 # must remain 0
+            externalEndpoints:
+            - endpoint: internal
+              ipAddressPool: internalapi
+              loadBalancerIPs:
+              - 172.17.0.80
+            hasAPIAccess: true
+          cell1:
+            cellDatabaseUser: nova_cell1
+            cellDatabaseInstance: openstack-cell1
+            cellMessageBusInstance: rabbitmq-cell1
+            noVNCProxyServiceTemplate:
+              replicas: 0 #1, to be started locally
+            metadataServiceTemplate:
+              replicas: 0 #1, to be started locally
+            conductorServiceTemplate:
+              replicas: 0 #1, to be started locally
+            hasAPIAccess: true
+            externalEndpoints:
+            - endpoint: internal
+              ipAddressPool: internalapi
+              loadBalancerIPs:
+              - 172.17.0.80
       apiServiceTemplate:
+        replicas: 0 #1, to be started locally
         externalEndpoints:
         - endpoint: internal
           ipAddressPool: internalapi
@@ -97,15 +160,21 @@ spec:
           - 172.17.0.80
       secret: osp-secret
       metadataServiceTemplate:
+        replicas: 0 #1, to be started locally
         externalEndpoints:
          - endpoint: internal
            ipAddressPool: internalapi
            loadBalancerIPs:
            - 172.17.0.80
+      schedulerServiceTemplate:
+        replicas: 0 #1, to be started locally
+      noVNCProxyServiceTemplate:
+        replicas: 0 #1, to be started locally, or just for cell1?
   manila:
+    enabled: false
     template:
       manilaAPI:
-        replicas: 1
+        replicas: 0
         externalEndpoints:
         - endpoint: internal
           ipAddressPool: internalapi
@@ -114,32 +183,39 @@ spec:
         networkAttachments:
         - internalapi
       manilaScheduler:
-        replicas: 1
+        replicas: 0
+        networkAttachments:
+        - internalapi
       manilaShares:
         share1:
-          replicas: 1
+          replicas: 0
           networkAttachments:
           - storage
   ovn:
     template:
       ovnDBCluster:
         ovndbcluster-nb:
+          replicas: 1
           dbType: NB
-          storageRequest: 10G
+          storageRequest: 1G
           networkAttachment: internalapi
         ovndbcluster-sb:
+          replicas: 1
           dbType: SB
-          storageRequest: 10G
+          storageRequest: 1G
           networkAttachment: internalapi
       ovnNorthd:
+        replicas: 1
         networkAttachment: internalapi
       ovnController:
+        replicas: 1
         external-ids:
           system-id: "random"
           ovn-bridge: "br-int"
           ovn-encap-type: "geneve"
         networkAttachment: tenant
   placement:
+    enabled: false # for adoption testing
     template:
       databaseInstance: openstack
       secret: osp-secret
@@ -151,12 +227,28 @@ spec:
   rabbitmq:
     templates:
       rabbitmq:
+        replicas: 1
+        resources:
+          requests:
+            cpu: 150m
+            memory: 250Mi
+          limits:
+            cpu: 300m
+            memory: 500Mi
         externalEndpoint:
           loadBalancerIPs:
           - 172.17.0.85
           ipAddressPool: internalapi
           sharedIP: false
       rabbitmq-cell1:
+        replicas: 1
+        resources:
+          requests:
+            cpu: 150m
+            memory: 250Mi
+          limits:
+            cpu: 300m
+            memory: 500Mi
         externalEndpoint:
           loadBalancerIPs:
           - 172.17.0.86
@@ -167,43 +259,46 @@ spec:
     template:
       databaseInstance: openstack
       heatAPI:
-        replicas: 1
+        replicas: 0
       heatEngine:
-        replicas: 1
+        replicas: 0
+      heatCfnAPI:
+        replicas: 0
       secret: osp-secret
   ironic:
     enabled: false
     template:
       databaseInstance: openstack
       ironicAPI:
-        replicas: 1
+        replicas: 0
       ironicConductors:
-      - replicas: 1
-        storageRequest: 10G
+      - replicas: 0
+        storageRequest: 1G
       ironicInspector:
-        replicas: 1
+        replicas: 0
       ironicNeutronAgent:
-        replicas: 1
+        replicas: 0
       secret: osp-secret
   ceilometer:
+    enabled: false
     template:
       passwordSelector:
         service: CeilometerPassword
       secret: osp-secret
       serviceUser: ceilometer
   swift:
-    enabled: true
+    enabled: false
     template:
       swiftRing:
-        ringReplicas: 1
+        ringReplicas: 1 # can't be 0
       swiftStorage:
-        replicas: 1
+        replicas: 1 # can't be 0
       swiftProxy:
-        replicas: 1
+        replicas: 1 # can't be 0
   octavia:
     enabled: false
     template:
       databaseInstance: openstack
       octaviaAPI:
-        replicas: 1
+        replicas: 0
       secret: osp-secret