diff --git a/host_vars/dev-mhel-test-01.yml b/host_vars/dev-mhel-test-01.yml
new file mode 100644
index 0000000..3e713ed
--- /dev/null
+++ b/host_vars/dev-mhel-test-01.yml
@@ -0,0 +1,4 @@
+---
+connect_postgres_host: "{{ stage }}-postgres02-01"
+shared_service_postgres_primary: "{{ stage }}-postgres02-01"
+shared_service_postgres_secondary: "{{ stage }}-postgres02-02"
diff --git a/pmci-database-backup-create.yml b/pmci-database-backup-create.yml
index 8c23d97..f8b2cab 100644
--- a/pmci-database-backup-create.yml
+++ b/pmci-database-backup-create.yml
@@ -10,7 +10,7 @@
 #   Creating database backups for created inventory
 #############################################################
 
-- hosts: "stage_{{ stage }}:!{{ stage }}-virtual-host-to-read-groups-vars"
+- hosts: "pmci_database_selector"
   serial: "{{ serial_number | default(1) }}"
   remote_user: root
   vars:
diff --git a/pmci-database-backup-restore.yml b/pmci-database-backup-restore.yml
index c70f407..0fc8ec3 100644
--- a/pmci-database-backup-restore.yml
+++ b/pmci-database-backup-restore.yml
@@ -10,7 +10,7 @@
 #   Restoring databases for created inventory
 #############################################################
 
-- hosts: "stage_{{ stage }}:!{{ stage }}-virtual-host-to-read-groups-vars"
+- hosts: "pmci_database_selector"
   serial: "{{ serial_number | default(1) }}"
   remote_user: root
   vars:
diff --git a/pmci-database-create.yml b/pmci-database-create.yml
index a02ee5c..5f46638 100644
--- a/pmci-database-create.yml
+++ b/pmci-database-create.yml
@@ -25,7 +25,7 @@
 #   Creating databases for created inventory
 #############################################################
 
-- hosts: "stage_{{ stage }}:!{{ stage }}-virtual-host-to-read-groups-vars"
+- hosts: "pmci_database_selector"
   serial: "{{ serial_number | default(1) }}"
   remote_user: root
   vars:
diff --git a/pmci-database-delete.yml b/pmci-database-delete.yml
index dae70b3..fabee38 100644
--- a/pmci-database-delete.yml
+++ b/pmci-database-delete.yml
@@ -25,7 +25,7 @@
 #   Deleting databases for created inventory
 #############################################################
 
-- hosts: "stage_{{ stage }}:!{{ stage }}-virtual-host-to-read-groups-vars"
+- hosts: "pmci_database_selector"
   serial: "{{ serial_number | default(1) }}"
   remote_user: root
   vars:
diff --git a/pmci-inventory-database.yml b/pmci-inventory-database.yml
index faa4a4d..fbb32d2 100644
--- a/pmci-inventory-database.yml
+++ b/pmci-inventory-database.yml
@@ -36,11 +36,18 @@
         - "stage_{{ stage }}"
       changed_when: False
 
+    - name: "Add <{{ cluster.stage }}-{{ tenant.key }}-{{ cluster.key }}-01> to hosts"
+      add_host:
+        name: "{{ cluster.stage }}-{{ tenant.key }}-{{ cluster.key }}-01"
+        groups:
+        - "stage_{{ stage }}"
+      changed_when: False
+
 #############################################################
 #   
 #############################################################
 
-- hosts: "{{ stage }}-virtual-host-to-read-groups-vars"
+- hosts: "{{ cluster.stage }}-{{ tenant.key }}-{{ cluster.key }}-01"
   serial: "{{ serial_number | default(1) }}"
   gather_facts: false
   connection: local
@@ -53,6 +60,7 @@
         groups:
         - "{{ item }}"
         - "stage_{{ stage }}"
+        - "pmci_database_selector"
       changed_when: False
       with_items: "{{ ['hcloud'] + ['stage_' + stage ] + [cluster.service] + (cluster.features | default([])) }}"
       when: item in ['connect', 'management_connect', 'keycloak', 'gitea', 'pdns']
@@ -63,6 +71,7 @@
         groups:
         - "{{ item }}"
         - "stage_{{ stage }}"
+        - "pmci_database_selector"
       changed_when: False
       with_items: "{{ ['hcloud'] + ['stage_' + stage ] + [cluster.service] + (cluster.features | default([])) }}"
       when: item in ['connect_wordpress']