diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
index 572e765..a03bb0b 100644
--- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
@@ -13,9 +13,10 @@
 e1_input
  e1_line 0 driver ipa
  ipa bind ${bsc.ip_address.addr}
-cs7 instance 1
+cs7 instance 0
  point-code 0.0.2
  asp asp0 2905 0 m3ua
+  local-ip ${bsc.ip_address.addr}
   remote-ip ${stp.ip_address.addr}
  as as0 m3ua
   asp asp0
diff --git a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl
index 31c57d3..8d0ab23 100644
--- a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl
@@ -18,6 +18,7 @@
 cs7 instance 0
  point-code 0.0.1
  asp asp0 2905 0 m3ua
+  local-ip ${msc.ip_address.addr}
   remote-ip ${stp.ip_address.addr}
  as as0 m3ua
   asp asp0
diff --git a/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl
index a59b7cd..7d12ab5 100644
--- a/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl
@@ -10,6 +10,15 @@
  logging level set-all debug
 line vty
  no login
+!cs7 instance 0
+! point-code 0.23.4
+! asp asp-clnt-OsmoSGSN-A 2905 0 m3ua
+!  local-ip ${sgsn.ip_address.addr}
+!  remote-ip stp.ip_address.addr
+! as as-clnt-OsmoSGSN-A m3ua
+!  asp asp-clnt-OsmoSGSN-A
+!  routing-key 3 0.23.4
+
 sgsn
  gtp local-ip ${sgsn.ip_address.addr}
  ggsn 0 remote-ip ${ggsn.ip_address.addr}