diff --git a/roles/mbs/common/templates/mbs-fedmsg.py b/roles/mbs/common/templates/mbs-fedmsg.py
index 3715f21b0e..1d8c824ba0 100644
--- a/roles/mbs/common/templates/mbs-fedmsg.py
+++ b/roles/mbs/common/templates/mbs-fedmsg.py
@@ -3,5 +3,5 @@ import socket
 config = {
     # So that the MBS can find it's cert in /etc/fedmsg.d/ssl.py
     'cert_prefix': 'mbs',
-    'name': 'mbs-%s' % socket.gethostname(),
+    'name': 'mbs.%s' % socket.gethostname().split('.', 1)[0],
 }