diff --git a/bbmri/modules/eric-compose.yml b/bbmri/modules/eric-compose.yml
index 3d31d84..b7a1cd4 100644
--- a/bbmri/modules/eric-compose.yml
+++ b/bbmri/modules/eric-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   focus-eric:
-    image: docker.verbis.dkfz.de/cache/samply/focus:main
+    image: docker.verbis.dkfz.de/cache/samply/focus:${FOCUS_TAG}
     container_name: bridgehead-focus-eric
     environment:
       API_KEY: ${ERIC_FOCUS_BEAM_SECRET_SHORT}
diff --git a/bbmri/modules/gbn-compose.yml b/bbmri/modules/gbn-compose.yml
index 921fd89..f1c624f 100644
--- a/bbmri/modules/gbn-compose.yml
+++ b/bbmri/modules/gbn-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   focus-gbn:
-    image: docker.verbis.dkfz.de/cache/samply/focus:main
+    image: docker.verbis.dkfz.de/cache/samply/focus:${FOCUS_TAG}
     container_name: bridgehead-focus-gbn
     environment:
       API_KEY: ${GBN_FOCUS_BEAM_SECRET_SHORT}
diff --git a/bridgehead b/bridgehead
index cfaabcc..8231792 100755
--- a/bridgehead
+++ b/bridgehead
@@ -69,6 +69,19 @@ loadVars() {
 
 	# Set some project-independent default values
 	: ${ENVIRONMENT:=production}
+
+	case "$ENVIRONMENT" in
+		"production")
+			FOCUS_TAG=main
+			;;
+		"test")
+			FOCUS_TAG=develop
+			;;
+		*)
+			report_error 7 "Environment \"$ENVIRONMENT\" is unknown. Assuming production. FIX THIS!"
+			FOCUS_TAG=main
+			;;
+	esac
 }
 
 case "$ACTION" in
diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml
index f41ef09..d92ccfb 100644
--- a/ccp/docker-compose.yml
+++ b/ccp/docker-compose.yml
@@ -19,7 +19,7 @@ services:
       - "traefik.http.routers.blaze_ccp.tls=true"
 
   focus:
-    image: docker.verbis.dkfz.de/cache/samply/focus:main
+    image: docker.verbis.dkfz.de/cache/samply/focus:${FOCUS_TAG}
     container_name: bridgehead-focus
     environment:
       API_KEY: ${FOCUS_BEAM_SECRET_SHORT}