diff --git a/deployment_scripts/puppet/manifests/create_hiera_config.pp b/deployment_scripts/puppet/manifests/create_hiera_config.pp
index cf3f809..2d79ec8 100644
--- a/deployment_scripts/puppet/manifests/create_hiera_config.pp
+++ b/deployment_scripts/puppet/manifests/create_hiera_config.pp
@@ -17,20 +17,16 @@ network_metadata:
     management:
       ipaddr: <%= @external_lb['management_ip'] %>
       namespace: false
-<% if @external_lb['skip_vrouter_vip'] -%>
     vrouter:
       namespace: false
       ipaddr: <%= @master_ip %>
 <% end -%>
-<% end -%>
 <% if @external_lb['external_public_vip'] -%>
     public:
       ipaddr: <%= @external_lb['public_ip'] %>
       namespace: false
-<% if @external_lb['skip_vrouter_pub_vip'] -%>
     vrouter_pub:
       namespace: false
-<% end -%>
 run_ping_checker: false
 <% end -%>
 <% if @external_lb['external_public_vip'] and @external_lb['enable_fake_floating'] -%>
diff --git a/environment_config.yaml b/environment_config.yaml
index 6892a15..dbd0c8d 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -5,14 +5,6 @@ attributes:
     value: true
     label: "Use external LB for public VIP"
     description: "Whether we should use external LB for public VIP."
-  skip_vrouter_pub_vip:
-    type: "checkbox"
-    weight: 20
-    value: true
-    label: "Skip vrouter public VIP"
-    description: "If you're moving controllers in different racks then you should disable vrouter VIPs because they won't work. All the routing is configured via rack switches."
-    restrictions:
-      - condition: "settings:external_loadbalancer.external_public_vip.value == false"
   public_ip:
     value: "10.10.1.1"
     label: "Public host"
@@ -27,14 +19,6 @@ attributes:
     value: true
     label: "Use external LB for management VIP"
     description: "Whether we should use external LB for management VIP."
-  skip_vrouter_vip:
-    type: "checkbox"
-    weight: 50
-    value: true
-    label: "Skip vrouter management VIP"
-    description: "If you're moving controllers in different racks then you should disable vrouter VIPs because they won't work. All the routing is configured via rack switches."
-    restrictions:
-      - condition: "settings:external_loadbalancer.external_management_vip.value == false"
   management_ip:
     value: "10.10.2.1"
     label: "Management host"