diff --git a/juju/home-maas/06-nova-compute.tf b/juju/home-maas/06-nova-compute.tf
index 9f34abc..3977e32 100644
--- a/juju/home-maas/06-nova-compute.tf
+++ b/juju/home-maas/06-nova-compute.tf
@@ -54,23 +54,6 @@ resource "juju_application" "nova-compute-kvm" {
   }
 }
 
-resource "juju_application" "ceilometer-agent" {
-  name = "ceilometer-agent"
-
-  model = var.model-name
-
-  charm {
-    name     = "ceilometer-agent"
-    channel  = var.openstack-channel
-  }
-
-  units = 0
-
-  config = {
-    use-internal-endpoints = "true"
-  }
-}
-
 resource "juju_application" "neutron-openvswitch" {
   name = "neutron-openvswitch"
 
@@ -121,21 +104,6 @@ resource "juju_application" "sysconfig-compute" {
   }
 }
 
-resource "juju_integration" "compute-ceilometer" {
-
-  model = var.model-name
-
-  application {
-    name     = juju_application.nova-compute-kvm.name
-    endpoint = "nova-ceilometer"
-  }
-
-  application {
-    name     = juju_application.ceilometer-agent.name
-    endpoint = "nova-ceilometer"
-  }
-}
-
 resource "juju_integration" "compute-ovs" {
 
   model = var.model-name
@@ -226,21 +194,6 @@ resource "juju_integration" "neutron-ovs-rmq" {
   }
 }
 
-resource "juju_integration" "ceilometer-agent-rmq" {
-
-  model = var.model-name
-
-  application {
-    name     = juju_application.ceilometer-agent.name
-    endpoint = "amqp"
-  }
-
-  application {
-    name     = juju_application.rabbitmq-server.name
-    endpoint = "amqp"
-  }
-}
-
 resource "juju_integration" "nova-compute-glance" {
 
   model = var.model-name
diff --git a/juju/home-maas/05-ceilometer.tf b/juju/home-maas/additional/05-ceilometer.tf
similarity index 100%
rename from juju/home-maas/05-ceilometer.tf
rename to juju/home-maas/additional/05-ceilometer.tf
diff --git a/juju/home-maas/05-gnocchi.tf b/juju/home-maas/additional/05-gnocchi.tf
similarity index 100%
rename from juju/home-maas/05-gnocchi.tf
rename to juju/home-maas/additional/05-gnocchi.tf
diff --git a/juju/home-maas/additional/07-ceilometer-agent.tf b/juju/home-maas/additional/07-ceilometer-agent.tf
new file mode 100644
index 0000000..5b0b80c
--- /dev/null
+++ b/juju/home-maas/additional/07-ceilometer-agent.tf
@@ -0,0 +1,46 @@
+resource "juju_application" "ceilometer-agent" {
+  name = "ceilometer-agent"
+
+  model = var.model-name
+
+  charm {
+    name     = "ceilometer-agent"
+    channel  = var.openstack-channel
+  }
+
+  units = 0
+
+  config = {
+    use-internal-endpoints = "true"
+  }
+}
+
+resource "juju_integration" "compute-ceilometer" {
+
+  model = var.model-name
+
+  application {
+    name     = juju_application.nova-compute-kvm.name
+    endpoint = "nova-ceilometer"
+  }
+
+  application {
+    name     = juju_application.ceilometer-agent.name
+    endpoint = "nova-ceilometer"
+  }
+}
+
+resource "juju_integration" "ceilometer-agent-rmq" {
+
+  model = var.model-name
+
+  application {
+    name     = juju_application.ceilometer-agent.name
+    endpoint = "amqp"
+  }
+
+  application {
+    name     = juju_application.rabbitmq-server.name
+    endpoint = "amqp"
+  }
+}
diff --git a/juju/home-maas/09-filebeat.tf b/juju/home-maas/additional/09-filebeat.tf
similarity index 100%
rename from juju/home-maas/09-filebeat.tf
rename to juju/home-maas/additional/09-filebeat.tf
diff --git a/juju/home-maas/09-landscape-client.tf b/juju/home-maas/additional/09-landscape-client.tf
similarity index 100%
rename from juju/home-maas/09-landscape-client.tf
rename to juju/home-maas/additional/09-landscape-client.tf
diff --git a/juju/home-maas/09-telegraf.tf b/juju/home-maas/additional/09-telegraf.tf
similarity index 100%
rename from juju/home-maas/09-telegraf.tf
rename to juju/home-maas/additional/09-telegraf.tf
diff --git a/juju/home-maas/20-model.tf b/juju/home-maas/lma/20-model.tf
similarity index 100%
rename from juju/home-maas/20-model.tf
rename to juju/home-maas/lma/20-model.tf
diff --git a/juju/home-maas/21-machines.tf b/juju/home-maas/lma/21-machines.tf
similarity index 100%
rename from juju/home-maas/21-machines.tf
rename to juju/home-maas/lma/21-machines.tf
diff --git a/juju/home-maas/22-graylog.tf b/juju/home-maas/lma/22-graylog.tf
similarity index 100%
rename from juju/home-maas/22-graylog.tf
rename to juju/home-maas/lma/22-graylog.tf
diff --git a/juju/home-maas/23-elastic.tf b/juju/home-maas/lma/23-elastic.tf
similarity index 100%
rename from juju/home-maas/23-elastic.tf
rename to juju/home-maas/lma/23-elastic.tf
diff --git a/juju/home-maas/24-grafana.tf b/juju/home-maas/lma/24-grafana.tf
similarity index 100%
rename from juju/home-maas/24-grafana.tf
rename to juju/home-maas/lma/24-grafana.tf
diff --git a/juju/home-maas/25-prometheus.tf b/juju/home-maas/lma/25-prometheus.tf
similarity index 100%
rename from juju/home-maas/25-prometheus.tf
rename to juju/home-maas/lma/25-prometheus.tf