diff --git a/osmo-ggsn-master/Makefile b/osmo-ggsn-master/Makefile
index 4f1e812a..0142467f 100644
--- a/osmo-ggsn-master/Makefile
+++ b/osmo-ggsn-master/Makefile
@@ -1,3 +1,10 @@
-RUN_ARGS?=--cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun --sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.0.201 -v ggsn-vol:/data --stop-signal SIGINT
+RUN_ARGS?=	\
+	--rm \
+	--cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun \
+	--sysctl net.ipv6.conf.all.disable_ipv6=0 \
+	--sysctl net.ipv6.conf.all.forwarding=1 \
+	--network sigtran --ip 172.18.0.201 \
+	-v ggsn-vol:/data \
+	--stop-signal SIGINT
 
 include ../make/Makefile
diff --git a/setup.sh b/setup.sh
index 03421ad0..55e36203 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
 docker network create --internal --subnet 172.18.0.0/16 sigtran
+docker network create --internal --subnet 172.20.0.0/24 --ipv6 --subnet fd10:5741:8e20::0/64 pdn