diff --git a/dhki/modules/dkfz-compose.yml b/dhki/modules/dkfz-compose.yml
index 306396b..f76ba2f 100644
--- a/dhki/modules/dkfz-compose.yml
+++ b/dhki/modules/dkfz-compose.yml
@@ -9,13 +9,13 @@ configs:
             "id": "UMM-TRANSFAIR",
             "name": "UMM TransFAIR",
             "virtualhost": "umm-transfair",
-            "beamconnect": "transfair-connect.umm.${BROKER_ID}"
+            "beamconnect": "transfair-connect.${REMOTE_TRANSFAIR_SITE_ID:-umm}.${BROKER_ID}"
           },
           {
             "id": "UMM-BLAZE",
             "name": "UMM MDAT Blaze",
             "virtualhost": "umm-blaze",
-            "beamconnect": "transfair-connect.umm.${BROKER_ID}"
+            "beamconnect": "transfair-connect.${REMOTE_TRANSFAIR_SITE_ID:-umm}.${BROKER_ID}"
           }
         ]
       }
diff --git a/dhki/modules/umm-compose.yml b/dhki/modules/umm-compose.yml
index 53db6d2..f65846e 100644
--- a/dhki/modules/umm-compose.yml
+++ b/dhki/modules/umm-compose.yml
@@ -12,12 +12,12 @@ configs:
         {
           "external": "umm-transfair",
           "internal": "transfair:8080",
-          "allowed": ["transfair-connect.dkfz.${BROKER_ID}"]
+          "allowed": ["transfair-connect.${REMOTE_TRANSFAIR_SITE_ID:-dkfz}.${BROKER_ID}"]
         },
         {
           "external": "umm-blaze",
           "internal": "transfair-input-blaze:8080",
-          "allowed": ["transfair-connect.dkfz.${BROKER_ID}"]
+          "allowed": ["transfair-connect.${REMOTE_TRANSFAIR_SITE_ID:-dkfz}.${BROKER_ID}"]
         }
       ]