diff --git a/bbmri/modules/gbn-setup.sh b/bbmri/modules/gbn-setup.sh
index b375416..d45170f 100644
--- a/bbmri/modules/gbn-setup.sh
+++ b/bbmri/modules/gbn-setup.sh
@@ -4,13 +4,22 @@ if [ "${ENABLE_GBN}" == "true" ]; then
 	log INFO "GBN setup detected -- will start services for German Biobank Node."
 	OVERRIDE+=" -f ./$PROJECT/modules/gbn-compose.yml"
 
-	# Set required variables
-	GBN_BROKER_ID=broker.bbmri.de
-	GBN_ROOT_CERT=gbn
-	if [ "{$ENABLE_TEST}" == "true" ]; then
-		GBN_BROKER_ID=broker-test.bbmri.de
-		GBN_ROOT_CERT=gbn.test
-	fi
+	# The environment needs to be defined in /etc/bridgehead
+	case "$ENVIRONMENT" in
+		"production")
+			ERIC_BROKER_ID=broker.bbmri.samply.de
+			ERIC_ROOT_CERT=eric
+			;;
+		"test")
+			ERIC_BROKER_ID=broker-test.bbmri-test.samply.de
+			ERIC_ROOT_CERT=eric.test
+			;;
+		*)
+			report_error 6 "Environment \"$ENVIRONMENT\" is unknown. Assuming production. FIX THIS!"
+			ERIC_BROKER_ID=broker.bbmri.samply.de
+			ERIC_ROOT_CERT=eric
+			;;
+	esac
 	
 	GBN_BROKER_URL=https://${GBN_BROKER_ID}
 	GBN_PROXY_ID=${SITE_ID}.${GBN_BROKER_ID}