diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ceaba5c3..6fd3198a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -149,13 +149,13 @@ debian-10-master-py3: {extends: '.test_instance'}
 ### ubuntu-2004-master-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-master-py3: {extends: '.test_instance'}
 # nopillars-ubuntu-1804-master-py3: {extends: '.test_instance'}
-### ubuntu-1804-master-py3: {extends: '.test_instance'}
+ubuntu-1804-master-py3: {extends: '.test_instance'}
 # default-centos-8-master-py3: {extends: '.test_instance'}
 # nopillars-centos-8-master-py3: {extends: '.test_instance'}
-### centos-8-master-py3: {extends: '.test_instance'}
+centos-8-master-py3: {extends: '.test_instance'}
 # default-centos-7-master-py3: {extends: '.test_instance'}
 # nopillars-centos-7-master-py3: {extends: '.test_instance'}
-### centos-7-master-py3: {extends: '.test_instance'}
+centos-7-master-py3: {extends: '.test_instance'}
 default-fedora-34-master-py3: {extends: '.test_instance'}
 # nopillars-fedora-34-master-py3: {extends: '.test_instance'}
 # fedora-34-master-py3: {extends: '.test_instance'}
@@ -176,10 +176,10 @@ default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
 # amazonlinux-2-master-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-master-py3: {extends: '.test_instance'}
 # nopillars-oraclelinux-8-master-py3: {extends: '.test_instance'}
-### oraclelinux-8-master-py3: {extends: '.test_instance'}
+oraclelinux-8-master-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-master-py3: {extends: '.test_instance'}
 # nopillars-oraclelinux-7-master-py3: {extends: '.test_instance'}
-### oraclelinux-7-master-py3: {extends: '.test_instance'}
+oraclelinux-7-master-py3: {extends: '.test_instance'}
 # default-arch-base-latest-master-py3: {extends: '.test_instance'}
 # nopillars-arch-base-latest-master-py3: {extends: '.test_instance'}
 # arch-base-latest-master-py3: {extends: '.test_instance'}
@@ -191,10 +191,10 @@ default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
 # gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 # default-almalinux-8-master-py3: {extends: '.test_instance'}
 # nopillars-almalinux-8-master-py3: {extends: '.test_instance'}
-### almalinux-8-master-py3: {extends: '.test_instance'}
+# almalinux-8-master-py3: {extends: '.test_instance'}
 # default-rockylinux-8-master-py3: {extends: '.test_instance'}
 # nopillars-rockylinux-8-master-py3: {extends: '.test_instance'}
-### rockylinux-8-master-py3: {extends: '.test_instance'}
+rockylinux-8-master-py3: {extends: '.test_instance'}
 # default-debian-11-3003-1-py3: {extends: '.test_instance'}
 # default-debian-10-3003-1-py3: {extends: '.test_instance'}
 # default-debian-9-3003-1-py3: {extends: '.test_instance'}
diff --git a/rabbitmq/config/init.sls b/rabbitmq/config/init.sls
index fa24ae4d..0b0c9fd8 100644
--- a/rabbitmq/config/init.sls
+++ b/rabbitmq/config/init.sls
@@ -6,9 +6,9 @@ include:
   - .vhosts
   - .users
   - .queues
-  - .policies
   - .plugins
   - .exchanges
   - .bindings
-  - .parameters
   - .clusters
+  - .policies
+  - .parameters
diff --git a/test/integration/default/files/_mapdata/almalinux-8.yaml b/test/integration/default/files/_mapdata/almalinux-8.yaml
index cbe78dc8..440bd95e 100644
--- a/test/integration/default/files/_mapdata/almalinux-8.yaml
+++ b/test/integration/default/files/_mapdata/almalinux-8.yaml
@@ -177,7 +177,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:
diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml
index 46e95cf3..8abaacf8 100644
--- a/test/integration/default/files/_mapdata/centos-7.yaml
+++ b/test/integration/default/files/_mapdata/centos-7.yaml
@@ -180,7 +180,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:
diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml
index fdc390dd..f029a060 100644
--- a/test/integration/default/files/_mapdata/centos-8.yaml
+++ b/test/integration/default/files/_mapdata/centos-8.yaml
@@ -180,7 +180,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:
diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml
index bd979601..dee04668 100644
--- a/test/integration/default/files/_mapdata/debian-11.yaml
+++ b/test/integration/default/files/_mapdata/debian-11.yaml
@@ -176,7 +176,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:
diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml
index d1645250..834ed0b1 100644
--- a/test/integration/default/files/_mapdata/debian-9.yaml
+++ b/test/integration/default/files/_mapdata/debian-9.yaml
@@ -177,7 +177,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:
diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml
index e6ebac19..165071b0 100644
--- a/test/integration/default/files/_mapdata/fedora-32.yaml
+++ b/test/integration/default/files/_mapdata/fedora-32.yaml
@@ -180,7 +180,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:
diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml
index 0ed1427b..3d21d734 100644
--- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml
+++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml
@@ -177,7 +177,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:
diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml
index 0ed1427b..3d21d734 100644
--- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml
+++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml
@@ -177,7 +177,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:
diff --git a/test/integration/default/files/_mapdata/rockylinux-8.yaml b/test/integration/default/files/_mapdata/rockylinux-8.yaml
index 0ed1427b..3d21d734 100644
--- a/test/integration/default/files/_mapdata/rockylinux-8.yaml
+++ b/test/integration/default/files/_mapdata/rockylinux-8.yaml
@@ -177,7 +177,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:
diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml
index 78f1120f..8d7d2dba 100644
--- a/test/integration/default/files/_mapdata/ubuntu-16.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@@ -178,7 +178,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:
diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml
index 350d413d..bf5dd41d 100644
--- a/test/integration/default/files/_mapdata/ubuntu-18.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@@ -178,7 +178,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:
diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml
index 525cdab4..4788b641 100644
--- a/test/integration/default/files/_mapdata/ubuntu-20.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@@ -178,7 +178,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition: