diff --git a/roles/fmc/tasks/main.yml b/roles/fmc/tasks/main.yml
index 3c497119e2..78a04030a1 100644
--- a/roles/fmc/tasks/main.yml
+++ b/roles/fmc/tasks/main.yml
@@ -5,12 +5,16 @@
     dest: /usr/lib/python3.7/site-packages/
     mode: '0755'
   when: inventory_hostname.startswith('odcs-backend-releng')
+  tags:
+  - fmc
 
 - name: Install fedora-messaging rpm
   dnf:
     package: fedora-messaging
     state: latest
   when: inventory_hostname.startswith('odcs-backend-releng')
+  tags:
+  - fmc
 
 - name: Place fedora-minimal-compose.toml /etc/fedora-messaging/
   template:
@@ -20,6 +24,8 @@
     group: root
     mode: 644
   when: inventory_hostname.startswith('odcs-backend-releng')
+  tags:
+  - fmc
 
 - name: Start and enable the fmc services
   service:
@@ -27,3 +33,45 @@
     state: started
     enabled: yes
   when: inventory_hostname.startswith('odcs-backend-releng')
+  tags:
+  - fmc
+
+- name: Create /etc/pki/fedora-messaging
+  file:
+    dest: /etc/pki/fedora-messaging
+    mode: 0775
+    owner: root
+    group: root
+    state: directory
+  tags:
+  - fmc
+
+- name: Deploy the fedora-messaging CA
+  copy:
+    src: "{{ private }}/files/rabbitmq/{{env}}/pki/ca.crt"
+    dest: /etc/pki/fedora-messaging/cacert.pem
+    mode: 0644
+    owner: root
+    group: root
+  tags:
+  - fmc
+
+- name: Deploy the fedora-messaging cert
+  copy:
+    src: "{{ private }}/files/rabbitmq/{{env}}/pki/issued/fmc{{env_suffix}}.crt"
+    dest: /etc/pki/fedora-messaging/fmc-cert.pem
+    mode: 0644
+    owner: root
+    group: root
+  tags:
+  - fmc
+
+- name: Deploy the fedora-messaging key
+  copy:
+    src: "{{ private }}/files/rabbitmq/{{env}}/pki/private/fmc{{env_suffix}}.key"
+    dest: /etc/pki/fedora-messaging/fmc-key.pem
+    mode: 0600
+    owner: root
+    group: root
+  tags:
+  - fmc
diff --git a/roles/fmc/templates/fedora-minimal-compose.toml b/roles/fmc/templates/fedora-minimal-compose.toml
index 25324f8f26..d32547bf21 100644
--- a/roles/fmc/templates/fedora-minimal-compose.toml
+++ b/roles/fmc/templates/fedora-minimal-compose.toml
@@ -3,11 +3,12 @@
 # This file is in the TOML format.
 amqp_url = "amqps://bodhi{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub"
 callback = "fedora-minimal-compose:Consumer"
+passive_declares = true
 
 [tls]
 ca_cert = "/etc/fedora-messaging/cacert.pem"
-keyfile = "/etc/fedora-messaging/fedora-key.pem"
-certfile = "/etc/fedora-messaging/fedora-cert.pem"
+keyfile = "/etc/fedora-messaging/fmc-key.pem"
+certfile = "/etc/fedora-messaging/fmc-cert.pem"
 
 [client_properties]
 app = "fmc"