diff --git a/jenkins-common.sh b/jenkins-common.sh
index 64ec0bb5..2993767c 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -87,8 +87,10 @@ network_create() {
 		network_clean
 		network_remove
 	fi
+	SUB4="172.18.$NET.0/24"
+	SUB6="fd02:db8:$NET::/64"
 	echo Creating network $NET_NAME
-	docker network create --internal --subnet $NET $NET_NAME
+	docker network create --internal --subnet $SUB4 --ipv6 --subnet $SUB6 $NET_NAME
 }
 
 network_remove() {
diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh
index 4543b91c..ac6a8806 100755
--- a/nplab-m3ua-test/jenkins.sh
+++ b/nplab-m3ua-test/jenkins.sh
@@ -15,7 +15,7 @@ cp m3ua-param-testtool.scm all-sgp-tests.txt $VOL_BASE_DIR/m3ua-tester/
 mkdir $VOL_BASE_DIR/stp
 cp osmo-stp.cfg $VOL_BASE_DIR/stp/
 
-network_create 172.18.7.0/24
+network_create 7
 
 # start container with STP in background
 docker run	--rm \
diff --git a/nplab-sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh
index 1d3111e2..39d37bb1 100755
--- a/nplab-sua-test/jenkins.sh
+++ b/nplab-sua-test/jenkins.sh
@@ -15,7 +15,7 @@ cp sua-param-testtool-sgp.scm some-sua-sgp-tests.txt $VOL_BASE_DIR/sua-tester/
 mkdir $VOL_BASE_DIR/stp
 cp osmo-stp.cfg $VOL_BASE_DIR/stp/
 
-network_create 172.18.6.0/24
+network_create 6
 
 # start container with STP in background
 docker run	--rm \
diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh
index 09737749..50660126 100755
--- a/osmo-gsm-tester/jenkins.sh
+++ b/osmo-gsm-tester/jenkins.sh
@@ -58,7 +58,7 @@ docker_images_require \
 	"debian-stretch-jenkins" \
 	"osmo-gsm-tester"
 
-network_create 172.18.50.0/24
+network_create 50
 
 mkdir $VOL_BASE_DIR/ogt-slave
 cp osmo-gsm-tester-slave.sh $VOL_BASE_DIR/ogt-slave/
diff --git a/scripts/regen_doc.sh b/scripts/regen_doc.sh
index ca540f98..cd3c5602 100755
--- a/scripts/regen_doc.sh
+++ b/scripts/regen_doc.sh
@@ -21,7 +21,7 @@ fi
 docker_images_require \
 	"$NAME-$IMAGE_SUFFIX"
 
-network_create 172.18.16.0/24
+network_create 16
 
 container_create() {
 	CONTAINERNAME=$1
diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh
index f91e6033..ee4417c9 100755
--- a/ttcn3-bsc-test/jenkins-sccplite.sh
+++ b/ttcn3-bsc-test/jenkins-sccplite.sh
@@ -16,7 +16,7 @@ cp sccplite/BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/
 mkdir $VOL_BASE_DIR/bsc
 cp sccplite/osmo-bsc.cfg $VOL_BASE_DIR/bsc/
 
-network_create 172.18.12.0/24
+network_create 12
 
 echo Starting container with BSC
 docker run	--rm \
diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh
index 11b9d2a5..0218a8f6 100755
--- a/ttcn3-bsc-test/jenkins.sh
+++ b/ttcn3-bsc-test/jenkins.sh
@@ -24,7 +24,7 @@ if [ "$IMAGE_SUFFIX" = "latest" ]; then
 	cp pre-mscpool-osmo-bsc.cfg $VOL_BASE_DIR/bsc/osmo-bsc.cfg
 fi
 
-network_create 172.18.2.0/24
+network_create 2
 
 echo Starting container with STP
 docker run	--rm \
diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh
index 1d771eb7..08d5be80 100755
--- a/ttcn3-bscnat-test/jenkins.sh
+++ b/ttcn3-bscnat-test/jenkins.sh
@@ -14,7 +14,7 @@ mkdir $VOL_BASE_DIR/bscnat
 cp osmo-bsc-nat.cfg $VOL_BASE_DIR/bscnat/
 cp bscs.config $VOL_BASE_DIR/bscnat/
 
-network_create 172.18.15.0/24
+network_create 15
 
 echo Starting container with BSCNAT
 docker run	--rm \
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index 6f37e542..3e61780f 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -101,7 +101,7 @@ start_testsuite() {
 			$REPO_USER/ttcn3-bts-test
 }
 
-network_create 172.18.9.0/24
+network_create 9
 
 mkdir $VOL_BASE_DIR/bts-tester
 mkdir $VOL_BASE_DIR/bts-tester/unix
diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh
index c950cc6e..7e25a9bf 100755
--- a/ttcn3-ggsn-test/jenkins.sh
+++ b/ttcn3-ggsn-test/jenkins.sh
@@ -12,7 +12,7 @@ cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/
 mkdir $VOL_BASE_DIR/ggsn
 cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/
 
-network_create 172.18.3.0/24
+network_create 3
 
 # start container with ggsn in background
 docker run	--cap-add=NET_ADMIN \
diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh
index 7bfacd6e..337491d3 100755
--- a/ttcn3-hlr-test/jenkins.sh
+++ b/ttcn3-hlr-test/jenkins.sh
@@ -6,7 +6,7 @@ docker_images_require \
 	"osmo-hlr-$IMAGE_SUFFIX" \
 	"ttcn3-hlr-test"
 
-network_create 172.18.10.0/24
+network_create 10
 
 mkdir $VOL_BASE_DIR/hlr-tester
 cp HLR_Tests.cfg $VOL_BASE_DIR/hlr-tester/
diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh
index d0ce1892..15fab492 100755
--- a/ttcn3-mgw-test/jenkins.sh
+++ b/ttcn3-mgw-test/jenkins.sh
@@ -12,7 +12,7 @@ cp MGCP_Test.cfg $VOL_BASE_DIR/mgw-tester/
 mkdir $VOL_BASE_DIR/mgw
 cp osmo-mgw.cfg $VOL_BASE_DIR/mgw/
 
-network_create 172.18.4.0/24
+network_create 4
 
 # start container with mgw in background
 docker run	--rm \
diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh
index fdba9a56..9f5e0bf7 100755
--- a/ttcn3-msc-test/jenkins.sh
+++ b/ttcn3-msc-test/jenkins.sh
@@ -7,7 +7,7 @@ docker_images_require \
 	"osmo-msc-$IMAGE_SUFFIX" \
 	"ttcn3-msc-test"
 
-network_create 172.18.1.0/24
+network_create 1
 
 mkdir $VOL_BASE_DIR/msc-tester
 mkdir $VOL_BASE_DIR/msc-tester/unix
diff --git a/ttcn3-nitb-sysinfo/jenkins.sh b/ttcn3-nitb-sysinfo/jenkins.sh
index eaef78d4..166a04d1 100755
--- a/ttcn3-nitb-sysinfo/jenkins.sh
+++ b/ttcn3-nitb-sysinfo/jenkins.sh
@@ -2,7 +2,7 @@
 
 . ../jenkins-common.sh
 
-network_create 172.18.5.0/24
+network_create 5
 
 # start container with nitb in background
 docker volume rm nitb-vol
diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh
index 9c8f293c..00376e73 100755
--- a/ttcn3-pcu-test/jenkins-sns.sh
+++ b/ttcn3-pcu-test/jenkins-sns.sh
@@ -6,7 +6,7 @@ docker_images_require \
 	"osmo-pcu-$IMAGE_SUFFIX" \
 	"ttcn3-pcu-test"
 
-network_create 172.18.14.0/24
+network_create 14
 
 mkdir $VOL_BASE_DIR/pcu-tester
 mkdir $VOL_BASE_DIR/pcu-tester/unix
diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh
index 3867e76c..fa4c914a 100755
--- a/ttcn3-pcu-test/jenkins.sh
+++ b/ttcn3-pcu-test/jenkins.sh
@@ -6,7 +6,7 @@ docker_images_require \
 	"osmo-pcu-$IMAGE_SUFFIX" \
 	"ttcn3-pcu-test"
 
-network_create 172.18.13.0/24
+network_create 13
 
 mkdir $VOL_BASE_DIR/pcu-tester
 mkdir $VOL_BASE_DIR/pcu-tester/unix
diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh
index 1da2883d..c2e958c2 100755
--- a/ttcn3-remsim-test/jenkins.sh
+++ b/ttcn3-remsim-test/jenkins.sh
@@ -56,7 +56,7 @@ start_testsuite() {
 			$REPO_USER/ttcn3-remsim-test
 }
 
-network_create 172.18.17.0/24
+network_create 17
 
 mkdir $VOL_BASE_DIR/remsim-tester
 
diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh
index 25fe5acb..895f12cb 100755
--- a/ttcn3-sccp-test/jenkins.sh
+++ b/ttcn3-sccp-test/jenkins.sh
@@ -13,7 +13,7 @@ cp SCCP_Tests.cfg $VOL_BASE_DIR/sccp-tester/
 mkdir $VOL_BASE_DIR/sccp
 cp sccp_demo_user.cfg $VOL_BASE_DIR/sccp/
 
-network_create 172.18.22.0/24
+network_create 22
 
 echo Starting container with sccp_demo_user
 docker run	--rm \
diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh
index 08af31c9..df91256c 100755
--- a/ttcn3-sgsn-test/jenkins.sh
+++ b/ttcn3-sgsn-test/jenkins.sh
@@ -7,7 +7,7 @@ docker_images_require \
 	"osmo-sgsn-$IMAGE_SUFFIX" \
 	"ttcn3-sgsn-test"
 
-network_create 172.18.8.0/24
+network_create 8
 
 mkdir $VOL_BASE_DIR/sgsn-tester
 cp SGSN_Tests.cfg $VOL_BASE_DIR/sgsn-tester/
diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh
index 52916cdf..f1bfeddd 100755
--- a/ttcn3-sip-test/jenkins.sh
+++ b/ttcn3-sip-test/jenkins.sh
@@ -6,7 +6,7 @@ docker_images_require \
 	"osmo-sip-$IMAGE_SUFFIX" \
 	"ttcn3-sip-test"
 
-network_create 172.18.11.0/24
+network_create 11
 
 mkdir $VOL_BASE_DIR/sip-tester
 mkdir $VOL_BASE_DIR/sip-tester/unix
diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh
index c45d1577..6b6a2dee 100755
--- a/ttcn3-stp-test/jenkins.sh
+++ b/ttcn3-stp-test/jenkins.sh
@@ -12,7 +12,7 @@ cp STP_Tests.cfg $VOL_BASE_DIR/stp-tester/
 mkdir $VOL_BASE_DIR/stp
 cp osmo-stp.cfg $VOL_BASE_DIR/stp/
 
-network_create 172.18.19.0/24
+network_create 19
 
 echo Starting container with STP
 docker run	--rm \