diff --git a/config/bundle_focal.yaml b/config/bundle_focal.yaml
index 1d92864..6f30f8e 100644
--- a/config/bundle_focal.yaml
+++ b/config/bundle_focal.yaml
@@ -139,6 +139,12 @@ machines:
     constraints: tags=control,asrock02
   "102":
     constraints: tags=control,asrock03
+  "103":
+    constraints: tags=control,asrock01
+  "104":
+    constraints: tags=control,asrock02
+  "105":
+    constraints: tags=control,asrock03
   # LMA Nodes
   "200":
     constraints: tags=compute,asrock01
@@ -158,11 +164,11 @@ machines:
     series: bionic
   # Contrail Nodes
   "400":
-    constraints: tags=control,asrock01
+    constraints: tags=compute,asrock01
   "401":
-    constraints: tags=control,asrock02
+    constraints: tags=compute,asrock02
   "402":
-    constraints: tags=control,asrock03
+    constraints: tags=compute,asrock03
 #  "500":
 #    constraints: tags=compute
 #  "501":
@@ -489,9 +495,9 @@ applications:
       preferred-api-version: 3
       token-provider: 'fernet'
     to:
-    - lxd:100
-    - lxd:101
-    - lxd:102
+    - lxd:103
+    - lxd:104
+    - lxd:105
   mysql:
     charm: cs:mysql-innodb-cluster
     num_units: 3
@@ -630,6 +636,18 @@ applications:
     - lxd:100
     - lxd:101
     - lxd:102
+  controller-server:
+    charm: cs:ubuntu
+    num_units: 6
+    bindings:
+      "": *oam-space
+    to:
+    - 100
+    - 101
+    - 102
+    - 103
+    - 104
+    - 105
   neutron-gateway:
     charm: cs:neutron-gateway
     num_units: 3
@@ -683,9 +701,9 @@ applications:
       ram-allocation-ratio: *ram-allocation-ratio
       cpu-allocation-ratio: *cpu-allocation-ratio
     to:
-    - lxd:100
-    - lxd:101
-    - lxd:102
+    - lxd:103
+    - lxd:104
+    - lxd:105
   placement:
     charm: cs:placement
     num_units: 3
@@ -700,9 +718,9 @@ applications:
       openstack-origin: *openstack-origin
       vip: *placement-vip
     to:
-    - lxd:100
-    - lxd:101
-    - lxd:102
+    - lxd:103
+    - lxd:104
+    - lxd:105
 
   nova-compute:
     charm: cs:nova-compute
@@ -770,9 +788,9 @@ applications:
       cluster-partition-handling: pause_minority
     num_units: 3
     to:
-    - lxd:100
-    - lxd:101
-    - lxd:102
+    - lxd:103
+    - lxd:104
+    - lxd:105
   heat:
     charm: cs:heat
     num_units: 3
@@ -1394,7 +1412,7 @@ relations:
   # sysconfig relations
   #- [ "ceph-osd:juju-info", "sysconfig-storage:juju-info" ]
   - [ "nova-compute:juju-info", "sysconfig-compute:juju-info" ]
-  - [ "neutron-gateway:juju-info", "sysconfig-control:juju-info" ]
+  - [ "controller-server:juju-info", "sysconfig-control:juju-info" ]
 
   # Neutron-gateway relations
   - [ "neutron-gateway", "nova-cloud-controller" ]
diff --git a/config/juju-model-default-cis-bionic.yaml b/config/juju-model-default-cis-bionic.yaml
index c654a09..a69e05f 100644
--- a/config/juju-model-default-cis-bionic.yaml
+++ b/config/juju-model-default-cis-bionic.yaml
@@ -73,7 +73,7 @@ cloudinit-userdata: |
       delete_user_files=true
   preruncmd:
     - locale-gen en_GB.UTF-8; update-locale
-    - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys A166877412DAC26E73CEBF3FF6C280178D13028C
+    - wget -qO - http://192.168.1.12/keys/security-benchmarks.asc | sudo apt-key add -
     - sudo add-apt-repository "deb http://192.168.1.12/private-ppa.launchpad.net/ubuntu-advantage/security-benchmarks/ubuntu bionic main"
     - sudo apt update
     - sudo DEBIAN_FRONTEND=noninteractive apt install -y -q usg-cisbenchmark
diff --git a/config/juju-model-default-cis-focal.yaml b/config/juju-model-default-cis-focal.yaml
index 90cd506..65e5bbd 100644
--- a/config/juju-model-default-cis-focal.yaml
+++ b/config/juju-model-default-cis-focal.yaml
@@ -132,7 +132,7 @@ cloudinit-userdata: |
       ruleset6="6.1.2 6.1.3 6.1.4 6.1.5 6.1.6 6.1.7 6.1.8 6.1.9 6.1.10 6.1.11 6.1.12 6.1.13 6.1.14 6.2.1 6.2.2 6.2.3 6.2.4 6.2.5 6.2.6 6.2.7 6.2.8 6.2.9 6.2.10 6.2.11 6.2.12 6.2.13 6.2.14 6.2.15 6.2.16 6.2.17"
   preruncmd:
     - locale-gen en_GB.UTF-8; update-locale
-    - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys A166877412DAC26E73CEBF3FF6C280178D13028C
+    - wget -qO - http://192.168.1.12/keys/security-benchmarks.asc | sudo apt-key add -
     - if hostnamectl | grep 18.04; then add-apt-repository "deb http://192.168.1.12/private-ppa.launchpad.net/ubuntu-advantage/security-benchmarks/ubuntu/ bionic main"; fi
     - if hostnamectl | grep 20.04; then add-apt-repository "deb http://192.168.1.12/private-ppa.launchpad.net/ubuntu-advantage/security-benchmarks/ubuntu/ focal main"; fi
     - sudo apt update