diff --git a/bundle-focal-ussuri-ovn.yaml b/bundle-focal-ussuri-ovn.yaml
index 0e68cbd..82cbfca 100644
--- a/bundle-focal-ussuri-ovn.yaml
+++ b/bundle-focal-ussuri-ovn.yaml
@@ -121,8 +121,6 @@ relations:
   - ceph-radosgw:certificates
 - - vault:certificates
   - mysql-innodb-cluster:certificates
-- - heat
-  - mysql-innodb-cluster
 - - heat
   - keystone
 - - heat
@@ -131,8 +129,6 @@ relations:
   - designate-bind:dns-backend
 - - designate:identity-service
   - keystone:identity-service
-- - designate:shared-db
-  - mysql-innodb-cluster:shared-db
 - - designate:amqp
   - rabbitmq-server:amqp
 - - memcached:cache
@@ -153,8 +149,6 @@ relations:
   - rabbitmq-server:amqp
 - - gnocchi:storage-ceph
   - ceph-mon:client
-- - gnocchi:shared-db
-  - mysql-innodb-cluster:shared-db
 - - gnocchi:amqp
   - rabbitmq-server:amqp
 - - gnocchi:coordinator-memcached
@@ -165,6 +159,24 @@ relations:
   - keystone:identity-service
 - - ceilometer:identity-credentials
   - keystone:identity-credentials
+- - gnocchi:shared-db
+  - gnocchi-mysql-router:shared-db
+- - gnocchi-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - designate:shared-db
+  - designate-mysql-router:shared-db
+- - designate-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - heat:shared-db
+  - heat-mysql-router:shared-db
+- - heat-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - vault:certificates
+  - designate:certificates
+- - vault:certificates
+  - heat:certificates
+- - vault:certificates
+  - gnocchi:certificates
 series: focal
 services:
   ceilometer:
@@ -408,3 +420,19 @@ services:
       gui-y: '1430'
     charm: cs:vault
     num_units: 1
+  heat-mysql-router:
+    annotations:
+      gui-x: '900'
+      gui-y: '1400'
+    charm: cs:mysql-router
+  gnocchi-mysql-router:
+    annotations:
+      gui-x: '900'
+      gui-y: '1400'
+    charm: cs:mysql-router
+  designate-mysql-router:
+    annotations:
+      gui-x: '900'
+      gui-y: '1400'
+    charm: cs:mysql-router
+
diff --git a/bundle-focal-ussuri.yaml b/bundle-focal-ussuri.yaml
index 4f06b86..3e3535f 100644
--- a/bundle-focal-ussuri.yaml
+++ b/bundle-focal-ussuri.yaml
@@ -91,8 +91,6 @@ relations:
   - neutron-api:neutron-plugin-api
 - - nova-cloud-controller:quantum-network-service
   - neutron-gateway:quantum-network-service
-- - heat
-  - mysql-innodb-cluster
 - - heat
   - keystone
 - - heat
@@ -101,8 +99,6 @@ relations:
   - designate-bind:dns-backend
 - - designate:identity-service
   - keystone:identity-service
-- - designate:shared-db
-  - mysql-innodb-cluster:shared-db
 - - designate:amqp
   - rabbitmq-server:amqp
 - - memcached:cache
@@ -121,8 +117,6 @@ relations:
   - rabbitmq-server:amqp
 - - gnocchi:storage-ceph
   - ceph-mon:client
-- - gnocchi:shared-db
-  - mysql-innodb-cluster:shared-db
 - - gnocchi:amqp
   - rabbitmq-server:amqp
 - - gnocchi:coordinator-memcached
@@ -139,6 +133,18 @@ relations:
   - neutron-openvswitch:neutron-plugin
 - - neutron-openvswitch:amqp
   - rabbitmq-server:amqp
+- - gnocchi:shared-db
+  - gnocchi-mysql-router:shared-db
+- - gnocchi-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - designate:shared-db
+  - designate-mysql-router:shared-db
+- - designate-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - heat:shared-db
+  - heat-mysql-router:shared-db
+- - heat-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
 series: focal
 services:
   ceilometer:
@@ -365,3 +371,18 @@ services:
       gui-x: '900'
       gui-y: '1400'
     charm: cs:mysql-router
+  heat-mysql-router:
+    annotations:
+      gui-x: '900'
+      gui-y: '1400'
+    charm: cs:mysql-router
+  gnocchi-mysql-router:
+    annotations:
+      gui-x: '900'
+      gui-y: '1400'
+    charm: cs:mysql-router
+  designate-mysql-router:
+    annotations:
+      gui-x: '900'
+      gui-y: '1400'
+    charm: cs:mysql-router
diff --git a/bundle-focal-victoria-ovn.yaml b/bundle-focal-victoria-ovn.yaml
index c205520..b65dd7b 100644
--- a/bundle-focal-victoria-ovn.yaml
+++ b/bundle-focal-victoria-ovn.yaml
@@ -121,8 +121,6 @@ relations:
   - ceph-radosgw:certificates
 - - vault:certificates
   - mysql-innodb-cluster:certificates
-- - heat
-  - mysql-innodb-cluster
 - - heat
   - keystone
 - - heat
@@ -131,8 +129,6 @@ relations:
   - designate-bind:dns-backend
 - - designate:identity-service
   - keystone:identity-service
-- - designate:shared-db
-  - mysql-innodb-cluster:shared-db
 - - designate:amqp
   - rabbitmq-server:amqp
 - - memcached:cache
@@ -153,8 +149,6 @@ relations:
   - rabbitmq-server:amqp
 - - gnocchi:storage-ceph
   - ceph-mon:client
-- - gnocchi:shared-db
-  - mysql-innodb-cluster:shared-db
 - - gnocchi:amqp
   - rabbitmq-server:amqp
 - - gnocchi:coordinator-memcached
@@ -165,6 +159,24 @@ relations:
   - keystone:identity-service
 - - ceilometer:identity-credentials
   - keystone:identity-credentials
+- - gnocchi:shared-db
+  - gnocchi-mysql-router:shared-db
+- - gnocchi-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - designate:shared-db
+  - designate-mysql-router:shared-db
+- - designate-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - heat:shared-db
+  - heat-mysql-router:shared-db
+- - heat-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - vault:certificates
+  - designate:certificates
+- - vault:certificates
+  - heat:certificates
+- - vault:certificates
+  - gnocchi:certificates
 series: focal
 services:
   ceilometer:
@@ -408,3 +420,18 @@ services:
       gui-y: '1430'
     charm: cs:vault
     num_units: 1
+  heat-mysql-router:
+    annotations:
+      gui-x: '900'
+      gui-y: '1400'
+    charm: cs:mysql-router
+  gnocchi-mysql-router:
+    annotations:
+      gui-x: '900'
+      gui-y: '1400'
+    charm: cs:mysql-router
+  designate-mysql-router:
+    annotations:
+      gui-x: '900'
+      gui-y: '1400'
+    charm: cs:mysql-router
diff --git a/bundle-focal-victoria.yaml b/bundle-focal-victoria.yaml
index b4f11bd..9c1083f 100644
--- a/bundle-focal-victoria.yaml
+++ b/bundle-focal-victoria.yaml
@@ -91,8 +91,6 @@ relations:
   - neutron-api:neutron-plugin-api
 - - nova-cloud-controller:quantum-network-service
   - neutron-gateway:quantum-network-service
-- - heat
-  - mysql-innodb-cluster
 - - heat
   - keystone
 - - heat
@@ -101,8 +99,6 @@ relations:
   - designate-bind:dns-backend
 - - designate:identity-service
   - keystone:identity-service
-- - designate:shared-db
-  - mysql-innodb-cluster:shared-db
 - - designate:amqp
   - rabbitmq-server:amqp
 - - memcached:cache
@@ -121,8 +117,6 @@ relations:
   - rabbitmq-server:amqp
 - - gnocchi:storage-ceph
   - ceph-mon:client
-- - gnocchi:shared-db
-  - mysql-innodb-cluster:shared-db
 - - gnocchi:amqp
   - rabbitmq-server:amqp
 - - gnocchi:coordinator-memcached
@@ -139,6 +133,18 @@ relations:
   - neutron-openvswitch:neutron-plugin
 - - neutron-openvswitch:amqp
   - rabbitmq-server:amqp
+- - gnocchi:shared-db
+  - gnocchi-mysql-router:shared-db
+- - gnocchi-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - designate:shared-db
+  - designate-mysql-router:shared-db
+- - designate-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - heat:shared-db
+  - heat-mysql-router:shared-db
+- - heat-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
 series: focal
 services:
   ceilometer:
@@ -365,3 +371,18 @@ services:
       gui-x: '900'
       gui-y: '1400'
     charm: cs:mysql-router
+  heat-mysql-router:
+    annotations:
+      gui-x: '900'
+      gui-y: '1400'
+    charm: cs:mysql-router
+  gnocchi-mysql-router:
+    annotations:
+      gui-x: '900'
+      gui-y: '1400'
+    charm: cs:mysql-router
+  designate-mysql-router:
+    annotations:
+      gui-x: '900'
+      gui-y: '1400'
+    charm: cs:mysql-router