diff --git a/juju/home-maas/00-init.tf b/juju/home-maas-focal/00-init.tf
similarity index 100%
rename from juju/home-maas/00-init.tf
rename to juju/home-maas-focal/00-init.tf
diff --git a/juju/home-maas/00-variables.tf b/juju/home-maas-focal/00-variables.tf
similarity index 100%
rename from juju/home-maas/00-variables.tf
rename to juju/home-maas-focal/00-variables.tf
diff --git a/juju/home-maas/01-cloud.tf b/juju/home-maas-focal/01-cloud.tf
similarity index 100%
rename from juju/home-maas/01-cloud.tf
rename to juju/home-maas-focal/01-cloud.tf
diff --git a/juju/home-maas/03-machines.tf b/juju/home-maas-focal/03-machines.tf
similarity index 100%
rename from juju/home-maas/03-machines.tf
rename to juju/home-maas-focal/03-machines.tf
diff --git a/juju/home-maas/04-keystone.tf b/juju/home-maas-focal/04-keystone.tf
similarity index 100%
rename from juju/home-maas/04-keystone.tf
rename to juju/home-maas-focal/04-keystone.tf
diff --git a/juju/home-maas/04-mysql.tf b/juju/home-maas-focal/04-mysql.tf
similarity index 100%
rename from juju/home-maas/04-mysql.tf
rename to juju/home-maas-focal/04-mysql.tf
diff --git a/juju/home-maas/04-rmq.tf b/juju/home-maas-focal/04-rmq.tf
similarity index 100%
rename from juju/home-maas/04-rmq.tf
rename to juju/home-maas-focal/04-rmq.tf
diff --git a/juju/home-maas/05-ceph.tf b/juju/home-maas-focal/05-ceph.tf
similarity index 100%
rename from juju/home-maas/05-ceph.tf
rename to juju/home-maas-focal/05-ceph.tf
diff --git a/juju/home-maas/05-cinder.tf b/juju/home-maas-focal/05-cinder.tf
similarity index 100%
rename from juju/home-maas/05-cinder.tf
rename to juju/home-maas-focal/05-cinder.tf
diff --git a/juju/home-maas/05-glance.tf b/juju/home-maas-focal/05-glance.tf
similarity index 100%
rename from juju/home-maas/05-glance.tf
rename to juju/home-maas-focal/05-glance.tf
diff --git a/juju/home-maas/05-heat.tf b/juju/home-maas-focal/05-heat.tf
similarity index 100%
rename from juju/home-maas/05-heat.tf
rename to juju/home-maas-focal/05-heat.tf
diff --git a/juju/home-maas/05-memcache.tf b/juju/home-maas-focal/05-memcache.tf
similarity index 100%
rename from juju/home-maas/05-memcache.tf
rename to juju/home-maas-focal/05-memcache.tf
diff --git a/juju/home-maas/05-nova.tf b/juju/home-maas-focal/05-nova.tf
similarity index 100%
rename from juju/home-maas/05-nova.tf
rename to juju/home-maas-focal/05-nova.tf
diff --git a/juju/home-maas/05-placement.tf b/juju/home-maas-focal/05-placement.tf
similarity index 100%
rename from juju/home-maas/05-placement.tf
rename to juju/home-maas-focal/05-placement.tf
diff --git a/juju/home-maas/06-nova-compute.tf b/juju/home-maas-focal/06-nova-compute.tf
similarity index 100%
rename from juju/home-maas/06-nova-compute.tf
rename to juju/home-maas-focal/06-nova-compute.tf
diff --git a/juju/home-maas/06-openstack-dashboard.tf b/juju/home-maas-focal/06-openstack-dashboard.tf
similarity index 100%
rename from juju/home-maas/06-openstack-dashboard.tf
rename to juju/home-maas-focal/06-openstack-dashboard.tf
diff --git a/juju/home-maas/07-controllers.tf b/juju/home-maas-focal/07-controllers.tf
similarity index 100%
rename from juju/home-maas/07-controllers.tf
rename to juju/home-maas-focal/07-controllers.tf
diff --git a/juju/home-maas/08-neutron.tf b/juju/home-maas-focal/08-neutron.tf
similarity index 100%
rename from juju/home-maas/08-neutron.tf
rename to juju/home-maas-focal/08-neutron.tf
diff --git a/juju/home-maas/10-vault.tf b/juju/home-maas-focal/10-vault.tf
similarity index 100%
rename from juju/home-maas/10-vault.tf
rename to juju/home-maas-focal/10-vault.tf
diff --git a/juju/home-maas/additional/05-ceilometer.tf b/juju/home-maas-focal/additional/05-ceilometer.tf
similarity index 100%
rename from juju/home-maas/additional/05-ceilometer.tf
rename to juju/home-maas-focal/additional/05-ceilometer.tf
diff --git a/juju/home-maas/additional/05-gnocchi.tf b/juju/home-maas-focal/additional/05-gnocchi.tf
similarity index 100%
rename from juju/home-maas/additional/05-gnocchi.tf
rename to juju/home-maas-focal/additional/05-gnocchi.tf
diff --git a/juju/home-maas/additional/07-ceilometer-agent.tf b/juju/home-maas-focal/additional/07-ceilometer-agent.tf
similarity index 100%
rename from juju/home-maas/additional/07-ceilometer-agent.tf
rename to juju/home-maas-focal/additional/07-ceilometer-agent.tf
diff --git a/juju/home-maas/additional/09-filebeat.tf b/juju/home-maas-focal/additional/09-filebeat.tf
similarity index 100%
rename from juju/home-maas/additional/09-filebeat.tf
rename to juju/home-maas-focal/additional/09-filebeat.tf
diff --git a/juju/home-maas/additional/09-landscape-client.tf b/juju/home-maas-focal/additional/09-landscape-client.tf
similarity index 100%
rename from juju/home-maas/additional/09-landscape-client.tf
rename to juju/home-maas-focal/additional/09-landscape-client.tf
diff --git a/juju/home-maas/additional/09-telegraf.tf b/juju/home-maas-focal/additional/09-telegraf.tf
similarity index 100%
rename from juju/home-maas/additional/09-telegraf.tf
rename to juju/home-maas-focal/additional/09-telegraf.tf
diff --git a/juju/home-maas/lma/20-model.tf b/juju/home-maas-focal/lma/20-model.tf
similarity index 100%
rename from juju/home-maas/lma/20-model.tf
rename to juju/home-maas-focal/lma/20-model.tf
diff --git a/juju/home-maas/lma/21-machines.tf b/juju/home-maas-focal/lma/21-machines.tf
similarity index 100%
rename from juju/home-maas/lma/21-machines.tf
rename to juju/home-maas-focal/lma/21-machines.tf
diff --git a/juju/home-maas/lma/22-graylog.tf b/juju/home-maas-focal/lma/22-graylog.tf
similarity index 100%
rename from juju/home-maas/lma/22-graylog.tf
rename to juju/home-maas-focal/lma/22-graylog.tf
diff --git a/juju/home-maas/lma/23-elastic.tf b/juju/home-maas-focal/lma/23-elastic.tf
similarity index 100%
rename from juju/home-maas/lma/23-elastic.tf
rename to juju/home-maas-focal/lma/23-elastic.tf
diff --git a/juju/home-maas/lma/24-grafana.tf b/juju/home-maas-focal/lma/24-grafana.tf
similarity index 100%
rename from juju/home-maas/lma/24-grafana.tf
rename to juju/home-maas-focal/lma/24-grafana.tf
diff --git a/juju/home-maas/lma/25-prometheus.tf b/juju/home-maas-focal/lma/25-prometheus.tf
similarity index 100%
rename from juju/home-maas/lma/25-prometheus.tf
rename to juju/home-maas-focal/lma/25-prometheus.tf
diff --git a/juju/home-maas/terraform.tfvars b/juju/home-maas-focal/terraform.tfvars
similarity index 100%
rename from juju/home-maas/terraform.tfvars
rename to juju/home-maas-focal/terraform.tfvars
diff --git a/juju/home-maas/user-data.yaml b/juju/home-maas-focal/user-data.yaml
similarity index 100%
rename from juju/home-maas/user-data.yaml
rename to juju/home-maas-focal/user-data.yaml