diff --git a/classes/cluster/virtual-mcp11-aio-ironic/infra/init.yml b/classes/cluster/virtual-mcp11-aio-ironic/infra/init.yml
deleted file mode 100644
index 219ed8d..0000000
--- a/classes/cluster/virtual-mcp11-aio-ironic/infra/init.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-classes:
-  - cluster.virtual-mcp11-aio.infra
diff --git a/classes/cluster/virtual-mcp11-aio-ironic/init.yml b/classes/cluster/virtual-mcp11-aio-ironic/init.yml
index 448fe80..56513f8 100755
--- a/classes/cluster/virtual-mcp11-aio-ironic/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-ironic/init.yml
@@ -1,5 +1,4 @@
 classes:
 - cluster.virtual-mcp11-aio
-- cluster.virtual-mcp11-aio-ironic.infra
 - cluster.virtual-mcp11-aio-ironic.openstack
 - cluster.overrides
diff --git a/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml
index 0390924..b4ef9c4 100755
--- a/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml
@@ -43,7 +43,7 @@
       bind:
         address: 0.0.0.0
       message_queue:
-        port: ${_param:rabbitmq_port}
+        port: ${_param:openstack_rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
       database:
@@ -53,7 +53,7 @@
       api_url: http://${_param:single_baremetal_address}:6385
       http_url: http://${_param:single_baremetal_address}
       message_queue:
-        port: ${_param:rabbitmq_port}
+        port: ${_param:openstack_rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
       database: