diff --git a/juju/home-maas/05-ceph.tf b/juju/home-maas/05-ceph.tf
index cccb90f..5715ab0 100644
--- a/juju/home-maas/05-ceph.tf
+++ b/juju/home-maas/05-ceph.tf
@@ -33,17 +33,17 @@ resource "juju_application" "ceph-osd" {
 resource "juju_machine" "ceph-mon-1" {
   model = juju_model.cpe-focal.name
   placement = join(":",["lxd",juju_machine.all_machines["101"].machine_id])
-#  constraints = "spaces=oam,ceph-access,ceph-replica"
+  constraints = "spaces=oam,ceph-access,ceph-replica"
 }
 resource "juju_machine" "ceph-mon-2" {
   model = juju_model.cpe-focal.name
   placement = join(":",["lxd",juju_machine.all_machines["102"].machine_id])
-#  constraints = "spaces=oam,ceph-access,ceph-replica"
+  constraints = "spaces=oam,ceph-access,ceph-replica"
 }
 resource "juju_machine" "ceph-mon-3" {
   model = juju_model.cpe-focal.name
   placement = join(":",["lxd",juju_machine.all_machines["103"].machine_id])
-#  constraints = "spaces=oam,ceph-access,ceph-replica"
+  constraints = "spaces=oam,ceph-access,ceph-replica"
 }
 
 
@@ -95,14 +95,17 @@ resource "juju_application" "ceph-mon" {
 resource "juju_machine" "ceph-rgw-1" {
   model = juju_model.cpe-focal.name
   placement = join(":",["lxd",juju_machine.all_machines["101"].machine_id])
+  constraints = "spaces=oam,ceph-access"
 }
 resource "juju_machine" "ceph-rgw-2" {
   model = juju_model.cpe-focal.name
   placement = join(":",["lxd",juju_machine.all_machines["102"].machine_id])
+  constraints = "spaces=oam,ceph-access"
 }
 resource "juju_machine" "ceph-rgw-3" {
   model = juju_model.cpe-focal.name
   placement = join(":",["lxd",juju_machine.all_machines["103"].machine_id])
+  constraints = "spaces=oam,ceph-access"
 }
 
 resource "juju_application" "ceph-radosgw" {
@@ -113,7 +116,6 @@ resource "juju_application" "ceph-radosgw" {
   charm {
     name     = "ceph-radosgw"
     channel  = "octopus/stable"
-
   }
 
   units = 3
@@ -124,6 +126,22 @@ resource "juju_application" "ceph-radosgw" {
     juju_machine.ceph-rgw-3.machine_id,
   ]))}"
 
+  endpoint_bindings = [{
+    space = "oam"
+  },{
+    space = "oam"
+    endpoint = "public"
+  },{
+    space = "oam"
+    endpoint = "admin"
+  },{
+    space = "oam"
+    endpoint = "internal"
+  },{
+    space = "ceph-access"
+    endpoint = "mon"
+  }]
+
   config = {
       source: var.openstack-origin
       vip = "10.0.1.224"
diff --git a/juju/home-maas/06-nova-compute.tf b/juju/home-maas/06-nova-compute.tf
index f717358..6b51e42 100644
--- a/juju/home-maas/06-nova-compute.tf
+++ b/juju/home-maas/06-nova-compute.tf
@@ -20,6 +20,12 @@ resource "juju_application" "nova-compute" {
     juju_machine.all_machines["1007"].machine_id,
    ]))}"
 
+   endpoint_bindings = [{
+     space = "oam"
+   },{
+     space = "oam"
+     endpoint = "internal"
+   }]
 
   config = {
        openstack-origin = var.openstack-origin
@@ -67,7 +73,6 @@ resource "juju_application" "ceilometer-agent" {
   config = {
     use-internal-endpoints = "true"
   }
-
 }
 
 resource "juju_application" "neutron-openvswitch" {
@@ -82,6 +87,13 @@ resource "juju_application" "neutron-openvswitch" {
 
   units = 0
 
+  endpoint_bindings = [{
+    space = "oam"
+  },{
+    space = "oam"
+    endpoint = "data"
+  }]
+
   config = {
       data-port                      = "br-data:ens9"
       dns-servers                    = "192.168.1.13"
diff --git a/juju/home-maas/07-controllers.tf b/juju/home-maas/07-controllers.tf
index d4edc85..586b93c 100644
--- a/juju/home-maas/07-controllers.tf
+++ b/juju/home-maas/07-controllers.tf
@@ -7,7 +7,7 @@ resource "juju_application" "controller-server" {
     name     = "ubuntu"
     channel  = "latest/stable"
     revision = "24"
-    series = "focal"
+    base = "ubuntu@20.04"
   }
 
   units = 6
@@ -48,12 +48,12 @@ resource "juju_integration" "control-sysconfig" {
   model = juju_model.cpe-focal.name
 
   application {
-    name = juju_application.controller-server.name
+    name = juju_application.sysconfig-control.name
     endpoint = "juju-info"
   }
 
   application {
-    name = juju_application.sysconfig-control.name
+    name = juju_application.controller-server.name
     endpoint = "juju-info"
   }
 }