diff --git a/roles/dribble.rb b/roles/dribble.rb
index 188656637..d049ea94c 100644
--- a/roles/dribble.rb
+++ b/roles/dribble.rb
@@ -17,14 +17,25 @@
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.3",
         :role => :external,
+        :metric => 150,
+        :source_route_table => 100,
         :inet => {
-          :address => "184.104.179.132"
-        },
-        :inet6 => {
-          :address => "2001:470:1:fa1::4"
+          :address => "184.104.179.132",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        }
+      },
+      :external => {
+        :interface => "bond0.103",
+        :role => :external,
+        :source_route_table => 150,
+        :inet => {
+          :address => "82.199.86.100",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
         }
       }
     }
diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 420522c59..a3af50077 100644
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -17,14 +17,25 @@
           :slaves => %w[enp1s0f0 enp1s0f1]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.3",
         :role => :external,
+        :metric => 150,
+        :source_route_table => 100,
         :inet => {
-          :address => "184.104.179.137"
-        },
-        :inet6 => {
-          :address => "2001:470:1:fa1::9"
+          :address => "184.104.179.137",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        }
+      },
+      :external => {
+        :interface => "bond0.103",
+        :role => :external,
+        :source_route_table => 150,
+        :inet => {
+          :address => "82.199.86.105",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
         }
       }
     }
diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index 942725b1c..ac8c6a885 100644
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -14,18 +14,7 @@
         }
       },
       :external => {
-        :zone => "ams",
-        :inet => {
-          :prefix => "27",
-          :gateway => "184.104.179.129"
-        },
-        :inet6 => {
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1",
-          :routes => {
-            "2600:9000::/28" => { :type => "unreachable" }
-          }
-        }
+        :zone => "ams"
       }
     }
   },
@@ -45,7 +34,7 @@
 
 override_attributes(
   :networking => {
-    :nameservers => ["10.0.48.14", "74.82.42.42", "2001:470:20::2"],
+    :nameservers => ["10.0.48.14", "8.8.8.8", "8.8.4.4"],
     :search => ["ams.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {
diff --git a/roles/faffy.rb b/roles/faffy.rb
index c4963d181..59d2633e3 100644
--- a/roles/faffy.rb
+++ b/roles/faffy.rb
@@ -17,14 +17,25 @@
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.3",
         :role => :external,
+        :metric => 150,
+        :source_route_table => 100,
         :inet => {
-          :address => "184.104.179.131"
-        },
-        :inet6 => {
-          :address => "2001:470:1:fa1::3"
+          :address => "184.104.179.131",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        }
+      },
+      :external => {
+        :interface => "bond0.103",
+        :role => :external,
+        :source_route_table => 150,
+        :inet => {
+          :address => "82.199.86.99",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
         }
       }
     }
diff --git a/roles/lockheed.rb b/roles/lockheed.rb
index a2307bfeb..de012bb53 100644
--- a/roles/lockheed.rb
+++ b/roles/lockheed.rb
@@ -17,14 +17,25 @@
           :slaves => %w[eno49 eno50]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.3",
         :role => :external,
+        :metric => 150,
+        :source_route_table => 100,
         :inet => {
-          :address => "184.104.179.144"
-        },
-        :inet6 => {
-          :address => "2001:470:1:fa1::10"
+          :address => "184.104.179.144",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        }
+      },
+      :external => {
+        :interface => "bond0.103",
+        :role => :external,
+        :source_route_table => 150,
+        :inet => {
+          :address => "82.199.86.112",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
         }
       }
     }
diff --git a/roles/norbert.rb b/roles/norbert.rb
index 50b8566ea..edd5462b6 100644
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -17,14 +17,25 @@
           :slaves => %w[enp25s0f0 enp25s0f1]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.3",
         :role => :external,
+        :metric => 150,
+        :source_route_table => 100,
         :inet => {
-          :address => "184.104.179.145"
-        },
-        :inet6 => {
-          :address => "2001:470:1:fa1::11"
+          :address => "184.104.179.145",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        }
+      },
+      :external => {
+        :interface => "bond0.103",
+        :role => :external,
+        :source_route_table => 150,
+        :inet => {
+          :address => "82.199.86.113",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
         }
       }
     }
diff --git a/roles/odin.rb b/roles/odin.rb
index 8263b6e78..be407424b 100644
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -17,14 +17,25 @@
           :slaves => %w[eno1np0 eno2np1]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.3",
         :role => :external,
+        :metric => 150,
+        :source_route_table => 100,
         :inet => {
-          :address => "184.104.179.143"
-        },
-        :inet6 => {
-          :address => "2001:470:1:fa1::f"
+          :address => "184.104.179.143",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        }
+      },
+      :external => {
+        :interface => "bond0.103",
+        :role => :external,
+        :source_route_table => 150,
+        :inet => {
+          :address => "82.199.86.111",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
         }
       }
     }
diff --git a/roles/spike-06.rb b/roles/spike-06.rb
index 9282ce5db..251baccd2 100644
--- a/roles/spike-06.rb
+++ b/roles/spike-06.rb
@@ -17,14 +17,25 @@
           :slaves => %w[eno1 eno2]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.3",
         :role => :external,
+        :metric => 150,
+        :source_route_table => 100,
         :inet => {
-          :address => "184.104.179.134"
-        },
-        :inet6 => {
-          :address => "2001:470:1:fa1::6"
+          :address => "184.104.179.134",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        }
+      },
+      :external => {
+        :interface => "bond0.103",
+        :role => :external,
+        :source_route_table => 150,
+        :inet => {
+          :address => "82.199.86.102",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
         }
       }
     }
diff --git a/roles/spike-07.rb b/roles/spike-07.rb
index 640c67656..c6325f419 100644
--- a/roles/spike-07.rb
+++ b/roles/spike-07.rb
@@ -17,14 +17,25 @@
           :slaves => %w[eno1 eno2]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.3",
         :role => :external,
+        :metric => 150,
+        :source_route_table => 100,
         :inet => {
-          :address => "184.104.179.135"
-        },
-        :inet6 => {
-          :address => "2001:470:1:fa1::7"
+          :address => "184.104.179.135",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        }
+      },
+      :external => {
+        :interface => "bond0.103",
+        :role => :external,
+        :source_route_table => 150,
+        :inet => {
+          :address => "82.199.86.103",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
         }
       }
     }
diff --git a/roles/spike-08.rb b/roles/spike-08.rb
index 9e3587824..04f37fa7f 100644
--- a/roles/spike-08.rb
+++ b/roles/spike-08.rb
@@ -17,14 +17,25 @@
           :slaves => %w[eno1 eno2]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.3",
         :role => :external,
+        :metric => 150,
+        :source_route_table => 100,
         :inet => {
-          :address => "184.104.179.136"
-        },
-        :inet6 => {
-          :address => "2001:470:1:fa1::8"
+          :address => "184.104.179.136",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        }
+      },
+      :external => {
+        :interface => "bond0.103",
+        :role => :external,
+        :source_route_table => 150,
+        :inet => {
+          :address => "82.199.86.104",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
         }
       }
     }
diff --git a/roles/tabaluga.rb b/roles/tabaluga.rb
index a90273778..11678ec07 100644
--- a/roles/tabaluga.rb
+++ b/roles/tabaluga.rb
@@ -21,14 +21,25 @@
           :slaves => %w[eno1 eno2]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.3",
         :role => :external,
+        :metric => 150,
+        :source_route_table => 100,
         :inet => {
-          :address => "184.104.179.142"
-        },
-        :inet6 => {
-          :address => "2001:470:1:fa1::e"
+          :address => "184.104.179.142",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        }
+      },
+      :external => {
+        :interface => "bond0.103",
+        :role => :external,
+        :source_route_table => 150,
+        :inet => {
+          :address => "82.199.86.110",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
         }
       }
     }
diff --git a/roles/vhagar.rb b/roles/vhagar.rb
index ab538a2ed..c1d5b3b9d 100644
--- a/roles/vhagar.rb
+++ b/roles/vhagar.rb
@@ -17,14 +17,25 @@
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.3",
         :role => :external,
+        :metric => 150,
+        :source_route_table => 100,
         :inet => {
-          :address => "184.104.179.133"
-        },
-        :inet6 => {
-          :address => "2001:470:1:fa1::5"
+          :address => "184.104.179.133",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        }
+      },
+      :external => {
+        :interface => "bond0.103",
+        :role => :external,
+        :source_route_table => 150,
+        :inet => {
+          :address => "82.199.86.101",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
         }
       }
     }