 +	$(INSTALL) -m 0644 04-flannel-cilium-cni.conflist $(DESTDIR)$(CNICONFDIR)
  	$(INSTALL) -m 0755 -d $(DESTDIR)$(CNIBINDIR)
  	$(INSTALL) -m 0755 $(TARGET) $(DESTDIR)$(CNIBINDIR)
+diff --git a/test/provision/wait-cilium.sh b/test/provision/wait-cilium.sh
+index e9d396a3c..07136746f 100755
+--- a/test/provision/wait-cilium.sh
++++ b/test/provision/wait-cilium.sh
+@@ -2,16 +2,10 @@
+ 
+ main() {
+     local cilium_started
+-    cilium_started=false
+ 
+-    for ((i = 0 ; i < 24; i++)); do
+-        if cilium status --brief > /dev/null 2>&1; then
+-            cilium_started=true
+-            break
+-        fi
+-        sleep 5s
+-        echo "Waiting for Cilium daemon to come up..."
+-    done
++    cilium_started=true
++    echo "As Cilium is running in visibility-mode we can't wait for it to start"
++    echo "as it might be waiting for cni0 to be created."
+ 
+     if [ "$cilium_started" = true ] ; then
+         echo 'Cilium successfully started!'

 
     if [[ "${IPV4}" -eq "1" ]]; then
         if [[ -z "${K8S}" ]]; then
@@ -356,14 +356,20 @@ service cilium restart
 
 cilium_started=false
 
-for ((i = 0 ; i < 24; i++)); do
-    if cilium status > /dev/null 2>&1; then
-        cilium_started=true
-        break
-    fi
-    sleep 5s
-    echo "Waiting for Cilium daemon to come up..."
-done
+if [[ "${cilium_options}" =~ "flannel-master-device" ]]; then
+    cilium_started=true
+    echo "As Cilium is running in visibility-mode we can't wait for it to start"
+    echo "as it might be waiting for cni0 to be created."
+else
+    for ((i = 0 ; i < 24; i++)); do
+        if cilium status > /dev/null 2>&1; then
+            cilium_started=true
+            break
+        fi
+        sleep 5s
+        echo "Waiting for Cilium daemon to come up..."
+    done
+fi
 
 if [ "\$cilium_started" = true ] ; then
     echo 'Cilium successfully started!'
diff --git a/examples/kubernetes-ingress/scripts/helpers.bash b/examples/kubernetes-ingress/scripts/helpers.bash
index d48f538f8..619fcebaf 100644
--- a/examples/kubernetes-ingress/scripts/helpers.bash
+++ b/examples/kubernetes-ingress/scripts/helpers.bash
@@ -54,9 +54,9 @@ kubernetes_master="${controllers_ips[0]}"
 # Default values for IPv4
 #
 # CIDR Range for Pods in cluster.

 k8s_service_cluster_ip_range=${K8S_SERVICE_CLUSTER_IP_RANGE:-"172.20.0.0/24"}
 cluster_dns_ip=${K8S_CLUSTER_DNS_IP:-"172.20.0.10"}
diff --git a/plugins/cilium-cni/Makefile b/plugins/cilium-cni/Makefile
index 166a8fa98..a6ff6059b 100644
--- a/plugins/cilium-cni/Makefile
+++ b/plugins/cilium-cni/Makefile
@@ -18,6 +18,6 @@ $(TARGET): $(SOURCES)
