diff --git a/comac-in-a-box/Makefile b/comac-in-a-box/Makefile
index bf536b2..696b40f 100644
--- a/comac-in-a-box/Makefile
+++ b/comac-in-a-box/Makefile
@@ -174,7 +174,11 @@
 	touch $@
 
 test: | $(M)/router
-	@timeout 30s bash -c "until timeout 1 ping -I oip1 13.1.1.254 -c 1; do sleep 1; done"
+	@timeout 60s bash -c \
+	"until timeout 3 ping -I oip1 13.1.1.254 -c 1 > /dev/null 2>&1; do \
+		echo 'Waiting for DP to be ready'; \
+	done"
+	ping -I oip1 13.1.1.254 -c 3
 
 reset-test:
 	kubectl delete po router || true
diff --git a/comac-in-a-box/comac-in-a-box-values.yaml b/comac-in-a-box/comac-in-a-box-values.yaml
index df30271..3825a54 100644
--- a/comac-in-a-box/comac-in-a-box-values.yaml
+++ b/comac-in-a-box/comac-in-a-box-values.yaml
@@ -23,12 +23,12 @@
 hss:
   cpu: 0.5
 spgwc:
-  image: omecproject/ngic-cp:0.1.0-debug
+  image: omecproject/ngic-cp:0.1.0-dev-debug
   cpu: 0.5
 spgwu:
   images:
     tags:
-      spgwu: omecproject/ngic-dp:0.1.0-debug
+      spgwu: omecproject/ngic-dp:0.1.0-dev-debug
   resources:
     cpu: 1
   conf:
@@ -44,15 +44,9 @@
   s1u:
     cni_plugin: simpleovs
     ipam: host-local
-    static_arp:
-    - ip: 119.0.0.253
-      mac: 0a:00:00:00:00:01
   sgi:
     cni_plugin: simpleovs
     ipam: host-local
-    static_arp:
-    - ip: 13.1.1.254
-      mac: 0e:00:00:00:00:01
 
 # oaisim values
 conf: