diff --git a/config/overlays/openstack_versioned_overlay_focal.yaml b/config/overlays/openstack_versioned_overlay_focal.yaml
index b031c3d..9e2f91d 100644
--- a/config/overlays/openstack_versioned_overlay_focal.yaml
+++ b/config/overlays/openstack_versioned_overlay_focal.yaml
@@ -1,64 +1,36 @@
 applications:
   aodh:
     charm: cs:aodh-48
-  appformix-advanced-routing:
-    charm: cs:advanced-routing-5
-  ccom-server:
-    charm: cs:ubuntu-18
-  appformix-server:
-    charm: cs:ubuntu-18
-  bcache-tuning:
-    charm: cs:bcache-tuning-6
-  canonical-livepatch:
-    charm: cs:canonical-livepatch-42
+#  bcache-tuning:
+#    charm: cs:bcache-tuning-6
+#  canonical-livepatch:
+#    charm: cs:canonical-livepatch-42
   ceilometer:
     charm: cs:ceilometer-282
   ceilometer-agent:
     charm: cs:ceilometer-agent-271
   ceph-mon:
     charm: cs:ceph-mon-55
-  ceph-mon2:
-    charm: cs:ceph-mon-55
   ceph-osd:
     charm: cs:ceph-osd-310
-  ceph-osd2:
-    charm: cs:ceph-osd-310
-  ceph-radosgw:
-    charm: cs:ceph-radosgw-296
+#  ceph-osd2:
+#    charm: cs:ceph-osd-310
+#  ceph-radosgw:
+#    charm: cs:ceph-radosgw-296
   cinder:
     charm: cs:cinder-310
+#  cinder2:
+#    charm: cs:cinder-310
   cinder-ceph:
     charm: cs:cinder-ceph-262 # upgrade to support availability-zone specification
-  cinder-ceph2:
-    charm: cs:cinder-ceph-262 # upgrade to support availability-zone specification
-  cinder-infinidat:
-    charm: cs:~bt-charmers/cinder-infinidat-19
-  contrail-agent:
-    charm: cs:~juniper-os-software/contrail-agent-27
-  contrail-agent-dpdk:
-    charm: cs:~juniper-os-software/contrail-agent-27
-  contrail-analytics:
-    charm: cs:~juniper-os-software/contrail-analytics-25
-  contrail-analytics-db:
-    charm: cs:~juniper-os-software/contrail-analyticsdb-25
-  contrail-controller:
-    charm: cs:~juniper-os-software/contrail-controller-27
-  contrail-haproxy:
-    charm: cs:haproxy-61
-  contrail-keystone-auth:
-    charm: cs:~juniper-os-software/contrail-keystone-auth-26
-  contrail-openstack:
-    charm: cs:~juniper-os-software/contrail-openstack-28
-  controller-server:
-    charm: cs:ubuntu-18
   easyrsa:
     charm: cs:~containers/easyrsa-408
   elasticsearch:
     charm: cs:elasticsearch-49
   etcd:
     charm: cs:etcd-583
-  external-advanced-routing:
-    charm: cs:advanced-routing-5
+#  external-advanced-routing:
+#    charm: cs:advanced-routing-5
   filebeat:
     charm: cs:filebeat-33
   glance:
@@ -75,6 +47,8 @@ applications:
     charm: cs:hacluster-76
   hacluster-cinder:
     charm: cs:hacluster-76
+#  hacluster-cinder2:
+#    charm: cs:hacluster-76
   hacluster-glance:
     charm: cs:hacluster-76
   hacluster-gnocchi:
@@ -87,24 +61,22 @@ applications:
     charm: cs:hacluster-76
   hacluster-keystone:
     charm: cs:hacluster-76
-  hacluster-manila:
-    charm: cs:hacluster-76
   hacluster-neutron:
     charm: cs:hacluster-76
   hacluster-nova:
     charm: cs:hacluster-76
-  hacluster-radosgw:
-    charm: cs:hacluster-76
+#  hacluster-radosgw:
+#    charm: cs:hacluster-76
   hacluster-vault:
     charm: cs:hacluster-76
   heat:
     charm: cs:heat-283
-  infinidat-tools:
-    charm: cs:~bt-charmers/infinidat-tools-8
-  juniper-server:
-    charm: cs:ubuntu-18
-  keepalived:
-    charm: cs:~containers/keepalived-98
+  keystone-ldap-domain1:
+    charm: cs:keystone-ldap-35
+  keystone-ldap-domain2:
+    charm: cs:keystone-ldap-35
+  keystone-ldap-domain3:
+    charm: cs:keystone-ldap-35
   keystone:
     charm: cs:keystone-323
   landscape-client:
@@ -117,14 +89,8 @@ applications:
     charm: cs:~openstack-charmers-next/rabbitmq-server-438 # attempted fix for LP#1939702
   landscape-server:
     charm: cs:landscape-server-39
-  lldpd:
-    charm: cs:lldpd-9
-  manila:
-    charm: cs:manila-30
-  manila-dashboard:
-    charm: cs:~openstack-charmers/manila-dashboard-2
-  manila-infinidat:
-    charm: cs:~bt-charmers/manila-infinidat-14
+#  lldpd:
+#    charm: cs:lldpd-9
   memcached:
     charm: cs:memcached-32
   mysql-innodb-cluster:
@@ -155,36 +121,24 @@ applications:
     charm: cs:mysql-router-11
   nagios:
     charm: cs:nagios-44
-  inf-ldap:
-    charm: cs:keystone-ldap-35
-  int-ldap:
-    charm: cs:keystone-ldap-35
+  neutron-gateway:
+    charm: cs:neutron-gateway-291
+  neutron-openvswitch:
+    charm: cs:neutron-openvswitch-282
   neutron-api:
     charm: cs:neutron-api-294
   placement:
     charm: cs:placement-19
   nova-cloud-controller:
     charm: cs:~openstack-charmers-next/nova-cloud-controller-549 # bug LP#1928992 Placement endpoints not being updated, or perhaps regressing to n-c-c endpoints, even after deploying placement service for train
-  nova-compute-kvm:
+  nova-compute:
     charm: cs:nova-compute-327
-  nova-compute-kvm-dpdk:
-    charm: cs:nova-compute-327
-  nrpe-compute-kvm:
-    charm: cs:nrpe-73
-  nrpe-compute-kvm-dpdk:
-    charm: cs:nrpe-73
   nrpe-container:
     charm: cs:nrpe-73
-  #nrpe-contrail:
-  #  charm: cs:nrpe-61
   nrpe-host:
     charm: cs:nrpe-73
-  nrpe-host-ceph-osd:
-    charm: cs:nrpe-73
-  nrpe-kvm:
-    charm: cs:nrpe-73
-  nrpe-kvm-appformix:
-    charm: cs:nrpe-73
+#  nrpe-kvm:
+#    charm: cs:nrpe-73
   ntp:
     charm: cs:ntp-46
   openstack-dashboard:
@@ -203,19 +157,13 @@ applications:
     #charm: cs:rabbitmq-server-110
   sysconfig-compute:
     charm: cs:sysconfig-2
-  sysconfig-compute-dpdk:
-    charm: cs:sysconfig-2
   sysconfig-control:
     charm: cs:sysconfig-2
-  sysconfig-storage:
-    charm: cs:sysconfig-2
   telegraf:
     charm: cs:telegraf-41
-  telegraf-appformix:
-    charm: cs:telegraf-41
   telegraf-prometheus:
     charm: cs:telegraf-41
-  thruk-agent:
-    charm: cs:thruk-agent-10
+#  thruk-agent:
+#    charm: cs:thruk-agent-10
   vault:
     charm: cs:vault-46