diff --git a/tasks/commonapps.yml b/tasks/commonapps.yml
index e6a84a3..3b8f26a 100644
--- a/tasks/commonapps.yml
+++ b/tasks/commonapps.yml
@@ -29,7 +29,7 @@
   include_tasks: runners/mkqueue.yml
   vars:
     username: "osci-pipeline-{{ rabbitmq_env }}"
-    queue_name: "{{ item }}-{{ rabbitmq_env }}"
+    queue_name: "{{ item }}"
     message_ttl: 432000000
     routing_keys:
       - "org.rockylinux.ci.#"
diff --git a/tasks/federation.yml b/tasks/federation.yml
index 7f49793..d1c1c86 100644
--- a/tasks/federation.yml
+++ b/tasks/federation.yml
@@ -48,7 +48,7 @@
     vhost: /public_pubsub
   when:
     - rabbitmq_enable_public
-    - pubsub_federation_pass
+    - pubsub_federation_pass is defined
 
 - name: Configure a policy to federate the topic exchange to public
   run_once: true
@@ -63,4 +63,4 @@
     vhost: /public_pubsub
   when:
     - rabbitmq_enable_public
-    - pubsub_federation_pass
+    - pubsub_federation_pass is defined
diff --git a/tasks/runners/mkqueue.yml b/tasks/runners/mkqueue.yml
index ac432a0..bed2eef 100644
--- a/tasks/runners/mkqueue.yml
+++ b/tasks/runners/mkqueue.yml
@@ -5,7 +5,7 @@
   community.rabbitmq.rabbitmq_user:
     user: "{{ username }}"
     vhost: "{{ vhost|default('/pubsub') }}"
-    read_priv: "^(zmq\\.topic)|^(amq\\.topic)|({{ username  }}.*)$"
+    read_priv: "^(zmq\\.topic)|^(amq\\.topic)|({{ username }}.*)$"
     write_priv: "^(amq\\.topic)|({{ username  }}.*){% for queue in write_queues|default([]) %}|({{ queue  }}.*){% endfor %}$"
     configure_priv: "^$"
     state: present
@@ -19,7 +19,7 @@
     vhost: "{{ vhost|default('/pubsub') }}"
     auto_delete: false
     durable: true
-    message_ttl: "{{ message_ttl|default('null') }}"
+    message_ttl: "{{ message_ttl|default(omit)) }}"
     state: present
     login_user: rockyadmin
     login_password: "{{ rabbitmq_admin_password }}"
@@ -32,10 +32,13 @@
     name: "amq.topic"
     destination: "{{ queue_name }}"
     destination_type: queue
-    routing_key: "{{ item }}"
+    routing_key: "{{ routing_item }}"
     vhost: "{{ vhost|default('/pubsub') }}"
     state: present
     login_user: rockyadmin
     login_password: "{{ rabbitmq_admin_password }}"
+  loop: '{{ routing_keys }}'
+  loop_control:
+    loop_var: routing_item
   tags:
     - rabbitmq
diff --git a/tasks/users.yml b/tasks/users.yml
index f02e724..2cb5838 100644
--- a/tasks/users.yml
+++ b/tasks/users.yml
@@ -57,5 +57,5 @@
     tags: monitoring
   when:
     - "'rabbitmq001' in inventory_hostname"
-    - rabbitmq_monitoring_username
-    - rabbitmq_monitoring_password
+    - rabbitmq_monitoring_username is defined
+    - rabbitmq_monitoring_password is defined