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