diff --git a/bbmri/modules/eric-compose.yml b/bbmri/modules/eric-compose.yml
index b7a1cd4..72baa6c 100644
--- a/bbmri/modules/eric-compose.yml
+++ b/bbmri/modules/eric-compose.yml
@@ -16,7 +16,7 @@ services:
       - "blaze"
 
   beam-proxy-eric:
-    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop
+    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:${BEAM_TAG}
     container_name: bridgehead-beam-proxy-eric
     environment:
       BROKER_URL: ${ERIC_BROKER_URL}
diff --git a/bbmri/modules/gbn-compose.yml b/bbmri/modules/gbn-compose.yml
index f1c624f..94631ba 100644
--- a/bbmri/modules/gbn-compose.yml
+++ b/bbmri/modules/gbn-compose.yml
@@ -16,7 +16,7 @@ services:
       - "blaze"
 
   beam-proxy-gbn:
-    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop
+    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:${BEAM_TAG}
     container_name: bridgehead-beam-proxy-gbn
     environment:
       BROKER_URL: ${GBN_BROKER_URL}
diff --git a/bridgehead b/bridgehead
index 702a351..81b19b3 100755
--- a/bridgehead
+++ b/bridgehead
@@ -80,13 +80,16 @@ loadVars() {
 	case "$ENVIRONMENT" in
 		"production")
 			export FOCUS_TAG=main
+			export BEAM_TAG=main
 			;;
 		"test")
 			export FOCUS_TAG=develop
+			export BEAM_TAG=develop
 			;;
 		*)
 			report_error 7 "Environment \"$ENVIRONMENT\" is unknown. Assuming production. FIX THIS!"
 			export FOCUS_TAG=main
+			export BEAM_TAG=main
 			;;
 	esac
 }
diff --git a/cce/docker-compose.yml b/cce/docker-compose.yml
index 13c5f38..87b6b1c 100644
--- a/cce/docker-compose.yml
+++ b/cce/docker-compose.yml
@@ -36,7 +36,7 @@ services:
       - "blaze"
 
   beam-proxy:
-    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop
+    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:${BEAM_TAG}
     container_name: bridgehead-beam-proxy
     environment:
       BROKER_URL: ${BROKER_URL}
diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml
index 52e7eb5..95ff9c3 100644
--- a/ccp/docker-compose.yml
+++ b/ccp/docker-compose.yml
@@ -36,7 +36,7 @@ services:
       - "blaze"
 
   beam-proxy:
-    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop
+    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:${BEAM_TAG}
     container_name: bridgehead-beam-proxy
     environment:
       BROKER_URL: ${BROKER_URL}
diff --git a/itcc/docker-compose.yml b/itcc/docker-compose.yml
index 197f4c5..7aab26d 100644
--- a/itcc/docker-compose.yml
+++ b/itcc/docker-compose.yml
@@ -36,7 +36,7 @@ services:
       - "blaze"
 
   beam-proxy:
-    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop
+    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:${BEAM_TAG}
     container_name: bridgehead-beam-proxy
     environment:
       BROKER_URL: ${BROKER_URL}
diff --git a/minimal/modules/dnpm-compose.yml b/minimal/modules/dnpm-compose.yml
index 238c72c..646a457 100644
--- a/minimal/modules/dnpm-compose.yml
+++ b/minimal/modules/dnpm-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   dnpm-beam-proxy:
-    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop
+    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:${BEAM_TAG}
     container_name: bridgehead-dnpm-beam-proxy
     environment:
       BROKER_URL: ${DNPM_BROKER_URL}