diff --git a/roles/openshift-apps/release-monitoring/templates/configmap.yml b/roles/openshift-apps/release-monitoring/templates/configmap.yml
index ac88e3c1c8..73cfa9af36 100644
--- a/roles/openshift-apps/release-monitoring/templates/configmap.yml
+++ b/roles/openshift-apps/release-monitoring/templates/configmap.yml
@@ -143,21 +143,21 @@ items:
       import socket
       config = {
           "active": True,
+          "topic_prefix": "org.release-monitoring",
           "sign_messages": True,
           "validate_signatures": True,
           "crypto_backend": "x509",
           "ssldir": "/etc/pki/fedmsg/",
-          "topic_prefix": "org.release-monitoring",
+          "cert_prefix": "release-monitoring",
+          "certnames": {"release-monitoring.{}".format(socket.gethostname()): "release-monitoring"},
 {% if env == 'staging' %}
           "environment": "stg",
           "relay_inbound": ["tcp://busgateway01.stg.phx2.fedoraproject.org:9941"],
           # Pointless because we don't listen for anything, but fedmsg explodes without it
           "endpoints": {"staging_gateway": ['tcp://stg.fedoraproject.org:9940']},
-          "certnames": {"anitya.{}".format(socket.gethostname()): "release-monitoring.stg.release-monitoring.org"},
 {% else %}
           "environment": "prod",
           "relay_inbound": ["tcp://busgateway01.phx2.fedoraproject.org:9941"],
           "endpoints": {"production_gateway": ['tcp://fedoraproject.org:9940']},
-          "certnames": {"anitya.{}".format(socket.gethostname()): "release-monitoring.release-monitoring.org"},
 {% endif %}
       }