diff --git a/Makefile b/Makefile
index 5b2a335..b02a8b8 100644
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,9 @@
 VENV		?= $(BUILD)/venv/aiab
 AIABVALUES	?= $(MAKEDIR)/aether-in-a-box-values.yaml
 
-KUBESPRAY_VERSION ?= release-2.11
-DOCKER_VERSION	?= 18.09
-K8S_VERSION	?= v1.15.3
+KUBESPRAY_VERSION ?= release-2.14
+DOCKER_VERSION	?= 19.03
+K8S_VERSION	?= v1.18.9
 HELM_VERSION	?= v2.16.1
 
 # used to start logging/monitoring and other infrastructure charts
@@ -88,7 +88,7 @@
 		-e "{'docker_version' : $(DOCKER_VERSION)}" \
 		-e "{'docker_iptables_enabled' : True}" \
 		-e "{'kube_version' : $(K8S_VERSION)}" \
-		-e "{'kube_network_plugin_multus' : True, 'multus_version' : v3.2}" \
+		-e "{'kube_network_plugin_multus' : True, 'multus_version' : stable, 'multus_cni_version' : 0.3.1}" \
 		-e "{'kube_proxy_metrics_bind_address' : 0.0.0.0:10249}" \
 		-e "{'kube_pods_subnet' : 192.168.0.0/17, 'kube_service_addresses' : 192.168.128.0/17}" \
 		-e "{'kube_apiserver_node_port_range' : 2000-36767}" \
@@ -130,7 +130,7 @@
 	sudo ip route replace 192.168.252.0/24 via 192.168.251.1 dev enb
 	kubectl apply -f $(RESOURCEDIR)/router.yaml
 	kubectl wait pod -n default --for=condition=Ready -l app=router --timeout=300s
-	kubectl -n default exec router ip route add 20.250.0.0/16 via 192.168.250.3
+	kubectl -n default exec router ip route add 10.250.0.0/16 via 192.168.250.3
 	kubectl delete net-attach-def core-net
 	touch $@
 
diff --git a/aether-in-a-box-values.yaml b/aether-in-a-box-values.yaml
index 743c3ff..dd845f1 100644
--- a/aether-in-a-box-values.yaml
+++ b/aether-in-a-box-values.yaml
@@ -25,7 +25,7 @@
   spgwc:
     pfcp: true
     ueIpPool:
-      ip: 20.250.0.0
+      ip: 10.250.0.0
   upf:
     name: "oaisim"
     sriov:
diff --git a/resources/router.yaml b/resources/router.yaml
index 142aee2..89dbf50 100644
--- a/resources/router.yaml
+++ b/resources/router.yaml
@@ -19,6 +19,7 @@
   name: core-net
 spec:
   config: '{
+    "cniVersion": "0.3.1",
     "type": "simpleovs",
     "ipam": {
         "type": "static"
@@ -31,6 +32,7 @@
   name: access-net
 spec:
   config: '{
+    "cniVersion": "0.3.1",
     "type": "simpleovs",
     "ipam": {
         "type": "static"
@@ -43,6 +45,7 @@
   name: enb-net
 spec:
   config: '{
+    "cniVersion": "0.3.1",
     "type": "simpleovs",
     "ipam": {
         "type": "static"
@@ -57,9 +60,9 @@
     app: router
   annotations:
     k8s.v1.cni.cncf.io/networks: '[
-            { "name": "core-net", "interface": "sgi-rtr", "ips": "192.168.250.1/24" },
-            { "name": "enb-net", "interface": "enb-rtr", "ips": "192.168.251.1/24" },
-            { "name": "access-net", "interface": "s1u-rtr", "ips": "192.168.252.1/24" }
+            { "name": "core-net", "interface": "core-rtr", "ips": ["192.168.250.1/24"] },
+            { "name": "enb-net", "interface": "enb-rtr", "ips": ["192.168.251.1/24"] },
+            { "name": "access-net", "interface": "access-rtr", "ips": ["192.168.252.1/24"] }
     ]'
 spec:
   containers:
diff --git a/resources/simpleovs b/resources/simpleovs
index f43b8a1..df0d975 100755
--- a/resources/simpleovs
+++ b/resources/simpleovs
@@ -60,9 +60,9 @@
 case $CNI_COMMAND in
 ADD)
 	res=$(ipam)
-	ip=$(echo $res | jq -r '.ip4.ip')
+	ip=$(echo $res | jq -r '.ips[0].address')
 	add_br_and_port $ip
-        echo '{"cniVersion":"0.2.0"}' | jq -c --arg ip $ip '.ip4.ip = $ip' >&3
+        echo '{"cniVersion":"0.3.1"}' | jq -c --arg ip $ip '.ips[0].address = $ip' >&3
 	;;
 DEL)
 	set +o errexit