diff --git a/config.py b/config.py
index fb9844c8..2ea4b5bd 100644
--- a/config.py
+++ b/config.py
@@ -75,6 +75,11 @@ class DevConfiguration(BaseConfiguration):
     # This requires that your principal be listed server side in ProxyPrincipals.
     KOJI_PROXYUSER = False
 
+    if path.exists('/home/fedora/modularity.keytab'):
+        KRB_PRINCIPAL = 'modularity@STG.FEDORAPROJECT.ORG'
+        KRB_KEYTAB = '/home/fedora/modularity.keytab'
+        KRB_CCACHE = '/var/tmp/krb5cc'
+
     REQUIRE_PACKAGER = False
     # You only need these FAS options if you turn on authorization
     # with REQUIRE_PACKAGER=True
diff --git a/fedmsg.d/module_build_service.py b/fedmsg.d/module_build_service.py
index 61235801..fdb2149d 100644
--- a/fedmsg.d/module_build_service.py
+++ b/fedmsg.d/module_build_service.py
@@ -15,11 +15,15 @@ config = {
             "tcp://stg.fedoraproject.org:9940",
         ],
         "relay_outbound": [
-            "tcp://fedmsg-relay:2001"
+            "tcp://fedmsg-relay:2001",
+            "tcp://127.0.0.1:4001",
         ],
     },
     "relay_inbound": [
-        "tcp://fedmsg-relay:2003"
+        # Try this first. (docker-compose)
+        "tcp://fedmsg-relay:2003",
+        # If it fails, then failover to this (modularity.fic.o)
+        "tcp://127.0.0.1:2003",
     ],
 
     # Start of code signing configuration