diff --git a/de/heat-templates/scripts/instance_boot.sh b/de/heat-templates/scripts/instance_boot.sh
index 7ac054a..7a4a599 100644
--- a/de/heat-templates/scripts/instance_boot.sh
+++ b/de/heat-templates/scripts/instance_boot.sh
@@ -486,6 +486,11 @@
             - ${PUBLIC_NODE_IP_ADDRESS}/${PUBLIC_NODE_IP_NETMASK}
 EOF
 
+# Remove Tunnel interface from netplan
+if [[ $TUNNEL_INTERFACE_NETPLAN_MANAGE == false ]]; then
+    sed -i "/        ${TUNNEL_INTERFACE}/,/            set-name: ${TUNNEL_INTERFACE}/d" ${cloud_netplan_cfg}
+fi
+
 if [[ -n ${IRONIC_BAREMETAL_INTERFACE} ]]; then
 cat << EOF >> ${cloud_netplan_cfg}
         br-baremetal:
@@ -506,11 +511,6 @@
             - veth-pxe-br
 EOF
 
-# Remove Tunnel interface from netplan
-if [[ $TUNNEL_INTERFACE_NETPLAN_MANAGE == false ]]; then
-    sed -i "/        ${TUNNEL_INTERFACE}/,/            set-name: ${TUNNEL_INTERFACE}/d" ${cloud_netplan_cfg}
-fi
-
 cat << EOF > /etc/systemd/system/ironic-vxlan-tunnel.service
 [Unit]
 Description=Ironic VXLAN tunnel