diff --git a/osmo-dev-on-debian-sid/cfg/osmo-bsc.cfg b/osmo-dev-on-debian-sid/cfg/osmo-bsc.cfg
index 601e8ed3..8b72dee9 100644
--- a/osmo-dev-on-debian-sid/cfg/osmo-bsc.cfg
+++ b/osmo-dev-on-debian-sid/cfg/osmo-bsc.cfg
@@ -4,6 +4,9 @@ network
  mm info 1
  short name OsmoBSC
  long name OsmoBSC
+ mgw 0
+  mgw remote-ip 127.0.0.1
+  mgw remote-port 12427
  bts 0
   type sysmobts
   band GSM-1800
@@ -39,9 +42,6 @@ network
 e1_input
  e1_line 0 driver ipa
 msc 0
- mgw remote-ip 127.0.0.1
- mgw remote-port 12427
- mgw endpoint-range 33 64
  allow-emergency deny
  codec-list hr3
 
diff --git a/osmo-ran/osmocom/osmo-bsc.cfg b/osmo-ran/osmocom/osmo-bsc.cfg
index b105eadd..bfc23f5b 100644
--- a/osmo-ran/osmocom/osmo-bsc.cfg
+++ b/osmo-ran/osmocom/osmo-bsc.cfg
@@ -19,6 +19,9 @@ network
  handover1 power budget hysteresis 3
  handover1 maximum distance 9999
  periodic location update 30
+ mgw 0
+  mgw remote-ip 127.0.0.1
+  mgw remote-port 2427
  bts 0
   type sysmobts
   band DCS1800
@@ -101,9 +104,6 @@ cs7 instance 0
 msc 0
  allow-emergency allow
  codec-list hr3 fr3
- !mgw remote-ip 192.168.30.1
- mgw remote-ip 127.0.0.1
- mgw remote-port 2427
  amr-config 12_2k forbidden
  amr-config 10_2k forbidden
  amr-config 7_95k forbidden
diff --git a/ttcn3-bsc-test-vamos/osmo-bsc.cfg b/ttcn3-bsc-test-vamos/osmo-bsc.cfg
index ab70a235..bf339fa6 100644
--- a/ttcn3-bsc-test-vamos/osmo-bsc.cfg
+++ b/ttcn3-bsc-test-vamos/osmo-bsc.cfg
@@ -77,6 +77,8 @@ network
  handover maximum distance 9999
  timer t3113 10
  timer t3212 30
+ mgw 0
+  mgw remote-ip 172.18.31.203
  bts 0
   type sysmobts
   band DCS1800
@@ -387,14 +389,11 @@ msc 0
  amr-config 5_15k forbidden
  amr-config 4_75k forbidden
  codec-list fr1 fr2 fr3 hr1 hr3
- mgw remote-ip 172.18.31.203
  lcls-mode mgw-loop
 msc 1
  msc-addr msc2
- mgw remote-ip 172.18.31.203
 msc 2
  msc-addr msc3
- mgw remote-ip 172.18.31.203
 
 network
  nri bitlen 10
diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg
index eefcde47..ef7ffaeb 100644
--- a/ttcn3-bsc-test/osmo-bsc.cfg
+++ b/ttcn3-bsc-test/osmo-bsc.cfg
@@ -87,6 +87,8 @@ network
  handover maximum distance 9999
  timer t3113 10
  timer t3212 30
+ mgw 0
+  mgw remote-ip 172.18.2.203
  bts 0
   type sysmobts
   band DCS1800
@@ -499,14 +501,11 @@ msc 0
  amr-config 5_15k forbidden
  amr-config 4_75k forbidden
  codec-list fr1 fr2 fr3 hr1 hr3
- mgw remote-ip 172.18.2.203
  lcls-mode mgw-loop
 msc 1
  msc-addr msc2
- mgw remote-ip 172.18.2.203
 msc 2
  msc-addr msc3
- mgw remote-ip 172.18.2.203
 
 network
  nri bitlen 10
diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg
index c7c6f90a..1bb164e9 100644
--- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg
+++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg
@@ -76,6 +76,8 @@ network
  handover maximum distance 9999
  timer t3113 10
  timer t3212 30
+ mgw 0
+  mgw remote-ip 172.18.12.203
  bts 0
   type sysmobts
   band DCS1800
@@ -476,7 +478,6 @@ msc 0
  amr-config 5_15k forbidden
  amr-config 4_75k forbidden
  codec-list fr1 fr2 fr3 hr1 hr3
- mgw remote-ip 172.18.12.203
  asp-protocol ipa
 bsc
  mid-call-timeout 0