diff --git a/etc/env/example.env b/etc/env/example.env
index ef0a12a4..1dd7de25 100644
--- a/etc/env/example.env
+++ b/etc/env/example.env
@@ -143,7 +143,8 @@ FEDERATION_SERVICE_URL=http://${CANDIG_INTERNAL_DOMAIN}:${FEDERATION_PORT}
 FEDERATION_PUBLIC_URL=${TYK_LOGIN_TARGET_URL}/federation
 FEDERATION_PRIVATE_URL=http://federation:${FEDERATION_PORT}
 FEDERATION_SERVICES=katsu htsget query
-FEDERATION_SELF_SERVER="{'id': 'internal-1', 'url': '${TYK_LOGIN_TARGET_URL}','location': {'name': '${CANDIG_SITE_LOCATION}','province': 'ON','province-code': 'ca-on'}}"
+FEDERATION_SELF_SERVER_ID=internal-1
+FEDERATION_SELF_SERVER="{'id': '${FEDERATION_SELF_SERVER_ID}', 'url': '${TYK_LOGIN_TARGET_URL}','location': {'name': '${CANDIG_SITE_LOCATION}','province': 'ON','province-code': 'ca-on'}}"
 
 
 # katsu metadata service
diff --git a/lib/federation/docker-compose.yml b/lib/federation/docker-compose.yml
index 9904df5d..b57bbfdd 100644
--- a/lib/federation/docker-compose.yml
+++ b/lib/federation/docker-compose.yml
@@ -33,6 +33,7 @@ services:
         VAULT_URL: ${VAULT_PRIVATE_URL}
         SERVICE_NAME: ${SERVICE_NAME}
         FEDERATION_SERVICE_URL: ${FEDERATION_SERVICE_URL}
+        FEDERATION_SELF_SERVER_ID: ${FEDERATION_SELF_SERVER_ID}
         DEBUG_MODE: ${CANDIG_DEBUG_MODE}
     extra_hosts:
         - "${CANDIG_DOMAIN}:${LOCAL_IP_ADDR}"
diff --git a/lib/federation/federation b/lib/federation/federation
index 6da555cf..11aabf1a 160000
--- a/lib/federation/federation
+++ b/lib/federation/federation
@@ -1 +1 @@
-Subproject commit 6da555cf4918de968e8de4cee65e53d5bf23bd86
+Subproject commit 11aabf1a339c9d1124cc459f3ced130ab03c46cc