diff --git a/net/config_2g3g b/net/config_2g3g
index 2149c39..bd27cf7 100644
--- a/net/config_2g3g
+++ b/net/config_2g3g
@@ -79,6 +79,7 @@ SGSN_GB_PORT=23000
 
 GBPROXY_IP="${TO_RAN_IP}"
 GBPROXY_GB_PORT=7777
+GBPROXY_RUN_IN_OSMO_DEV=0
 
 PCU_GB_LOCAL_PORT=23000
 
diff --git a/net/templates/run.sh b/net/templates/run.sh
index e1cf226..a5a8720 100755
--- a/net/templates/run.sh
+++ b/net/templates/run.sh
@@ -238,7 +238,11 @@ fi
 
 term "$hlr" HLR
 term "$sgsn" SGSN
-term "$gbproxy" GBPROXY
+
+if [ "${GBPROXY_RUN_IN_OSMO_DEV}" = 1 ]; then
+  term "$gbproxy" GBPROXY
+fi
+
 term "$mgw4msc" MGW4MSC
 term "$msc" MSC
 term "$hnbgw" HNBGW