diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
index a83ddce2cb7ef544982affed6fc81170f1c0b7ae..17c02a0ab92935ba1d28b92636ccc4f17ac7e7af 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
@@ -18,7 +18,11 @@ fi
 
 _prefix=${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}
 
+rm -rf /etc/cni/net.d/*
+rm -rf /var/lib/cni/*
+rm -rf /opt/cni/*
 mkdir -p /opt/cni
+mkdir -p /etc/cni/net.d/
 _addtl_mounts=',{"type":"bind","source":"/opt/cni","destination":"/opt/cni","options":["bind","rw","slave","mode=777"]}'
 
 if [ "$NETWORK_DRIVER" = "calico" ]; then
diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
index ec4d21dad46805d2da15c82781b47b6f1f6e5dda..e01876178a4d76fe750611746de02a72b72ca88b 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
@@ -19,7 +19,11 @@ fi
 _prefix=${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}
 
 _addtl_mounts=''
+rm -rf /etc/cni/net.d/*
+rm -rf /var/lib/cni/*
+rm -rf /opt/cni/*
 mkdir -p /opt/cni
+mkdir -p /etc/cni/net.d/
 _addtl_mounts=',{"type":"bind","source":"/opt/cni","destination":"/opt/cni","options":["bind","rw","slave","mode=777"]}'
 
 if [ "$NETWORK_DRIVER" = "calico" ]; then