diff --git a/config-drive/master_config.sh b/config-drive/master_config.sh
index a131f3e..4634207 100644
--- a/config-drive/master_config.sh
+++ b/config-drive/master_config.sh
@@ -9,7 +9,10 @@
 echo "Configuring network interfaces"
 envsubst < /root/interfaces > /etc/network/interfaces
 ip a flush dev ens3
-rm /var/run/network/ifstate.ens3
+rm -f /var/run/network/ifstate.ens3
+if [[ $(grep -E '^\ *gateway\ ' /etc/network/interfaces) ]]; then
+(ip r s | grep ^default) && ip r d default || /bin/true
+fi;
 ifup ens3
 
 echo "Preparing metadata model"
diff --git a/config-drive/mirror_config.sh b/config-drive/mirror_config.sh
index 4b312c0..fbb618a 100644
--- a/config-drive/mirror_config.sh
+++ b/config-drive/mirror_config.sh
@@ -8,7 +8,10 @@
 echo "Configuring network interfaces"
 envsubst < /root/interfaces > /etc/network/interfaces
 ip a flush dev ens3
-rm /var/run/network/ifstate.ens3
+rm -f /var/run/network/ifstate.ens3
+if [[ $(grep -E '^\ *gateway\ ' /etc/network/interfaces) ]]; then
+(ip r s | grep ^default) && ip r d default || /bin/true
+fi;
 ifup ens3
 
 echo "Configuring salt"