diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh
index 329dbef0..5d55093c 100755
--- a/ttcn3-sgsn-test/jenkins.sh
+++ b/ttcn3-sgsn-test/jenkins.sh
@@ -19,6 +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
+	sed "/fd02:db8/d" -i $VOL_BASE_DIR/stp/osmo-stp.cfg
+	sed "/fd02:db8/d" -i $VOL_BASE_DIR/sgsn/osmo-sgsn.cfg
+fi
+
 mkdir $VOL_BASE_DIR/unix
 
 echo Starting container with STP
diff --git a/ttcn3-sgsn-test/osmo-sgsn.cfg b/ttcn3-sgsn-test/osmo-sgsn.cfg
index 68af5624..e571315f 100644
--- a/ttcn3-sgsn-test/osmo-sgsn.cfg
+++ b/ttcn3-sgsn-test/osmo-sgsn.cfg
@@ -56,7 +56,10 @@ ctrl
 cs7 instance 0
  point-code 0.23.4
  asp asp-clnt-OsmoSGSN-A 2905 0 m3ua
+  local-ip 172.18.8.10
+  local-ip fd02:db8:8::10
   remote-ip 172.18.8.200
+  remote-ip fd02:db8:8::200
  as as-clnt-OsmoSGSN-A m3ua
   asp asp-clnt-OsmoSGSN-A
   routing-key 3 0.23.4
diff --git a/ttcn3-sgsn-test/osmo-stp.cfg b/ttcn3-sgsn-test/osmo-stp.cfg
index a0b5b0bd..3ee0668b 100644
--- a/ttcn3-sgsn-test/osmo-stp.cfg
+++ b/ttcn3-sgsn-test/osmo-stp.cfg
@@ -38,7 +38,9 @@ cs7 instance 0
  xua rkm routing-key-allocation dynamic-permitted
  asp virt-rnc0-0 23908 2905 m3ua
   local-ip 172.18.8.200
+  local-ip fd02:db8:8::200
   remote-ip 172.18.8.103
+  remote-ip fd02:db8:8::103
  as virt-rnc0 m3ua
   asp virt-rnc0-0
   routing-key 2 0.24.3
@@ -46,5 +48,8 @@ cs7 instance 0
   update route 0.24.3 7.255.7 linkset virt-rnc0
  listen m3ua 2905
   accept-asp-connections dynamic-permitted
+  local-ip 172.18.8.200
+  local-ip fd02:db8:8::200
  listen ipa 5000
   accept-asp-connections dynamic-permitted
+  local-ip 172.18.8.200