diff --git a/roles/mailman3/tasks/main.yml b/roles/mailman3/tasks/main.yml
index 630f302c2e..9f06ea3219 100644
--- a/roles/mailman3/tasks/main.yml
+++ b/roles/mailman3/tasks/main.yml
@@ -80,14 +80,14 @@
     mode: "{{item.mode}}"
   when: env == 'staging'
   with_items:
-    - src: "{{private}}/files/rabbitmq/staging/pki/issued/mailman3-fedmsg-plugin.stg.crt"
-      dest: mailman3-fedmsg-plugin.crt
+    - src: "{{private}}/files/rabbitmq/staging/pki/issued/mailman.stg.crt"
+      dest: mailman.crt
       mode: "444"
-    - src: "{{private}}/files/rabbitmq/staging/pki/private/mailman3-fedmsg-plugin.stg.key"
-      dest: mailman3-fedmsg-plugin.key
+    - src: "{{private}}/files/rabbitmq/staging/pki/private/mailman.stg.key"
+      dest: mailman.key
       mode: "440"
     - src: "{{private}}/files/rabbitmq/staging/pki/ca.crt"
-      dest: mailman3-fedmsg-plugin.ca
+      dest: mailman.ca
       mode: "444"
   tags:
   - mailman
@@ -102,14 +102,14 @@
     mode: "{{item.mode}}"
   when: env != 'staging'
   with_items:
-    - src: "{{private}}/files/rabbitmq/production/pki/issued/mailman3-fedmsg-plugin.crt"
-      dest: mailman3-fedmsg-plugin.crt
+    - src: "{{private}}/files/rabbitmq/production/pki/issued/mailman.crt"
+      dest: mailman.crt
       mode: "444"
-    - src: "{{private}}/files/rabbitmq/production/pki/private/mailman3-fedmsg-plugin.key"
-      dest: mailman3-fedmsg-plugin.key
+    - src: "{{private}}/files/rabbitmq/production/pki/private/mailman.key"
+      dest: mailman.key
       mode: "440"
     - src: "{{private}}/files/rabbitmq/production/pki/ca.crt"
-      dest: mailman3-fedmsg-plugin.ca
+      dest: mailman.ca
       mode: "444"
   tags:
   - mailman
diff --git a/roles/mailman3/templates/fedmsg-plugin.toml.j2 b/roles/mailman3/templates/fedmsg-plugin.toml.j2
index d4825e25e7..e870119afd 100644
--- a/roles/mailman3/templates/fedmsg-plugin.toml.j2
+++ b/roles/mailman3/templates/fedmsg-plugin.toml.j2
@@ -9,9 +9,9 @@ topic_prefix = "org.fedoraproject.prod"
 {% endif %}
 
 [tls]
-ca_cert = "/etc/pki/rabbitmq/mailman/mailman3-fedmsg-plugin.ca"
-keyfile = "/etc/pki/rabbitmq/mailman/mailman3-fedmsg-plugin.key"
-certfile = "/etc/pki/rabbitmq/mailman/mailman3-fedmsg-plugin.crt"
+ca_cert = "/etc/pki/rabbitmq/mailman/mailman.ca"
+keyfile = "/etc/pki/rabbitmq/mailman/mailman.key"
+certfile = "/etc/pki/rabbitmq/mailman/mailman.crt"
 
 [client_properties]
 app = "Mailman3"