diff --git a/tasks/mq_setup.yml b/tasks/mq_setup.yml
index 64530afb..4c06e3e7 100644
--- a/tasks/mq_setup.yml
+++ b/tasks/mq_setup.yml
@@ -70,4 +70,14 @@
         force: true
       no_log: true
 
-# Note: Add the tasks for additional MQ servers here
+- name: Setup RPC MQ Service (Qdrouterd)
+  delegate_to: "{{ _oslomsg_rpc_setup_host }}"
+  when:
+    - "(_oslomsg_configure_rpc | default(_oslomsg_rpc_transport is defined))"
+    - "(_oslomsg_rpc_transport is defined) and (_oslomsg_rpc_transport == 'amqp')"
+  tags:
+    - common-qdrouterd
+  block:
+    - name: Add RPC Qdrouterd user
+      shell: "echo {{ _oslomsg_rpc_password }} | saslpasswd2 -c -p -f /var/lib/qdrouterd/qdrouterd.sasldb -u AMQP {{ _oslomsg_rpc_userid }}"
+      no_log: true