diff --git a/osmo-sgsn-master/osmo-sgsn.cfg b/osmo-sgsn-master/osmo-sgsn.cfg
index b39a83e8..3daf9b31 100644
--- a/osmo-sgsn-master/osmo-sgsn.cfg
+++ b/osmo-sgsn-master/osmo-sgsn.cfg
@@ -18,7 +18,6 @@ ns
  timer tns-test 30
  timer tns-alive 3
  timer tns-alive-retries 10
- encapsulation udp local-ip 127.0.0.1
- encapsulation udp local-port 23000
- encapsulation framerelay-gre enabled 0
+ bind udp local
+  listen 127.0.0.1 23000
 bssgp
diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh
index 5d55093c..623f4682 100755
--- a/ttcn3-sgsn-test/jenkins.sh
+++ b/ttcn3-sgsn-test/jenkins.sh
@@ -19,10 +19,12 @@ cp osmo-sgsn.cfg $VOL_BASE_DIR/sgsn/
 mkdir $VOL_BASE_DIR/stp
 cp osmo-stp.cfg $VOL_BASE_DIR/stp/
 
-# Disable IPv6 until libosmo-sccp.git release > 1.3.0 is available
 if [ "$IMAGE_SUFFIX" = "latest" ]; then
+	# Disable IPv6 until libosmo-sccp.git release > 1.3.0 is available
 	sed "/fd02:db8/d" -i $VOL_BASE_DIR/stp/osmo-stp.cfg
-	sed "/fd02:db8/d" -i $VOL_BASE_DIR/sgsn/osmo-sgsn.cfg
+
+	# latest doesn't use yet the NS2 code
+	cp  osmo-sgsn.latest.cfg "$VOL_BASE_DIR/sgsn/osmo-sgsn.cfg"
 fi
 
 mkdir $VOL_BASE_DIR/unix
diff --git a/ttcn3-sgsn-test/osmo-sgsn.cfg b/ttcn3-sgsn-test/osmo-sgsn.cfg
index e571315f..b587fa8d 100644
--- a/ttcn3-sgsn-test/osmo-sgsn.cfg
+++ b/ttcn3-sgsn-test/osmo-sgsn.cfg
@@ -71,9 +71,9 @@ ns
  timer tns-test 30
  timer tns-alive 3
  timer tns-alive-retries 10
- encapsulation udp local-ip 172.18.8.10
- encapsulation udp local-port 23000
- encapsulation framerelay-gre enabled 0
+ bind udp local
+  listen 172.18.8.10 23000
+  accept-ipaccess
 bssgp
 sgsn
  gtp local-ip 172.18.8.10
diff --git a/ttcn3-sgsn-test/osmo-sgsn.latest.cfg b/ttcn3-sgsn-test/osmo-sgsn.latest.cfg
new file mode 100644
index 00000000..5cee7d45
--- /dev/null
+++ b/ttcn3-sgsn-test/osmo-sgsn.latest.cfg
@@ -0,0 +1,101 @@
+!
+! OsmoSGSN (1.2.0.46-e77e-dirty) configuration saved from vty
+!!
+!
+log gsmtap 172.18.8.103
+ logging level set-all debug
+ logging filter all 1
+!
+log stderr
+ logging filter all 1
+ logging color 1
+ logging print category 1
+ logging timestamp 1
+ logging print extended-timestamp 1
+ logging print file 1
+ logging level all everything
+ logging level mm debug
+ logging level pag notice
+ logging level meas notice
+ logging level ref notice
+ logging level gprs debug
+ logging level ns info
+ logging level bssgp info
+ logging level llc debug
+ logging level sndcp debug
+ logging level slhc notice
+ logging level ranap info
+ logging level sua info
+ logging level v42bis info
+ logging level lglobal info
+ logging level llapd notice
+ logging level linp notice
+ logging level lmux notice
+ logging level lmi notice
+ logging level lmib notice
+ logging level lsms notice
+ logging level lctrl notice
+ logging level lgtp debug
+ logging level lstats notice
+ logging level lgsup debug
+ logging level loap notice
+ logging level lss7 notice
+ logging level lsccp info
+ logging level lsua notice
+ logging level lm3ua notice
+ logging level lmgcp notice
+!
+stats interval 5
+!
+line vty
+ no login
+ bind 0.0.0.0
+ctrl
+ bind 0.0.0.0
+!
+cs7 instance 0
+ point-code 0.23.4
+ asp asp-clnt-OsmoSGSN-A 2905 0 m3ua
+  local-ip 172.18.8.10
+  remote-ip 172.18.8.200
+ as as-clnt-OsmoSGSN-A m3ua
+  asp asp-clnt-OsmoSGSN-A
+  routing-key 3 0.23.4
+ns
+ timer tns-block 3
+ timer tns-block-retries 3
+ timer tns-reset 3
+ timer tns-reset-retries 3
+ timer tns-test 30
+ timer tns-alive 3
+ timer tns-alive-retries 10
+ encapsulation udp local-ip 172.18.8.10
+ encapsulation udp local-port 23000
+ encapsulation framerelay-gre enabled 0
+bssgp
+sgsn
+ gtp local-ip 172.18.8.10
+ ggsn 0 remote-ip 172.18.8.103
+ ggsn 0 gtp-version 1
+ gsup remote-ip 172.18.8.103
+ gsup remote-port 4222
+ auth-policy remote
+ gsup oap-id 0
+ ! apn * ggsn 0
+ no cdr filename
+ no cdr trap
+ cdr interval 600
+ timer t3312 600
+ timer t3322 6
+ timer t3350 6
+ timer t3360 6
+ timer t3370 6
+ timer t3313 30
+ timer t3314 44
+ timer t3316 44
+ timer t3385 8
+ timer t3386 8
+ timer t3395 8
+ timer t3397 8
+ no compression rfc1144
+ no compression v42bis