diff --git a/comac-in-a-box/Makefile b/comac-in-a-box/Makefile
index 9d59908..a036cd8 100644
--- a/comac-in-a-box/Makefile
+++ b/comac-in-a-box/Makefile
@@ -137,7 +137,7 @@
 	sudo cp $(BUILD)/cni-plugins/static /opt/cni/bin/
 
 # TODO: need to connect ONOS
-$(M)/fabric: | $(M)/setup /opt/cni/bin/simpleovs
+$(M)/fabric: | $(M)/setup /opt/cni/bin/simpleovs /opt/cni/bin/static
 	sudo apt install -y openvswitch-switch
 	sudo ovs-vsctl --may-exist add-br br-s1u-net
 	sudo ovs-vsctl --may-exist add-port br-s1u-net s1u-enb -- set Interface s1u-enb type=internal
@@ -151,10 +151,10 @@
 
 $(M)/omec: | $(M)/helm-ready $(WORKSPACE)/cord/helm-charts /opt/cni/bin/simpleovs /opt/cni/bin/static $(M)/fabric
 	cd $(WORKSPACE)/cord/helm-charts/omec; \
-	helm dep up omec-data-plane && \
 	helm dep up omec-control-plane && \
+	helm upgrade --install $(HELM_GLOBAL_ARGS) --namespace omec omec-control-plane omec-control-plane -f $(CIABVALUES) && \
+	kubectl -n omec wait --for=condition=Ready --timeout=300s pod -l app=spgwc && \
 	helm upgrade --install $(HELM_GLOBAL_ARGS) --namespace omec omec-data-plane omec-data-plane -f $(CIABVALUES) && \
-	helm upgrade --install $(HELM_GLOBAL_ARGS) --namespace omec omec-control-plane omec-control-plane -f $(CIABVALUES)
 	$(WORKSPACE)/cord/helm-charts/scripts/wait_for_pods.sh omec
 	touch $@
 
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 f163291..69dbe31 100644
--- a/comac-in-a-box/comac-in-a-box-values.yaml
+++ b/comac-in-a-box/comac-in-a-box-values.yaml
@@ -43,15 +43,11 @@
   ipam: static
 
 config:
-  # omec-data-plane values
   sriov:
     enabled: false
-  spgwc:
-    multiUpfs: false
   spgwu:
-    multiUpfs: false
+    dpName: "oaisim"
     devices: "--no-pci --vdev eth_af_packet0,iface=s1u-net --vdev eth_af_packet1,iface=sgi-net"
-  # omec-control-plane values
   mme:
     cfgFiles:
       config.json:
@@ -66,10 +62,8 @@
             dig3: -1
   hss:
     bootstrap:
-      apn: apn1
       key: "465b5ce8b199b49faa5f0a2ee238a6bc"
       opc: "d4416644f6154936193433dd20a0ace0"
-      sqn: 96
       users:
         - imsiStart: "208014567891201"
           msisdnStart: "1122334455"