diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index d56d0540a..4043e0dd7 100644
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -7,9 +7,9 @@
       :internal => {
         :inet => {
           :prefix => "20",
-          :gateway => "10.0.48.10",
+          :gateway => "10.0.48.14",
           :routes => {
-            "10.0.0.0/8" => { :via => "10.0.48.10" }
+            "10.0.0.0/8" => { :via => "10.0.48.14" }
           }
         }
       },
diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 95bfe9e39..b5c07e67d 100644
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -2,10 +2,6 @@
 description "Master role applied to ironbelly"
 
 default_attributes(
-  :dhcpd => {
-    :first_address => "10.0.63.1",
-    :last_address => "10.0.63.254"
-  },
   :elasticsearch => {
     :cluster => {
       :routing => {
@@ -80,9 +76,7 @@
 
 run_list(
   "role[equinix-ams]",
-  "role[gateway]",
   "recipe[rsyncd]",
-  "recipe[dhcpd]",
   "recipe[imagery::za_ngi_aerial]",
   "recipe[imagery::us_imagery]"
 )
diff --git a/roles/tabaluga.rb b/roles/tabaluga.rb
index d682df74a..df8d76ea7 100644
--- a/roles/tabaluga.rb
+++ b/roles/tabaluga.rb
@@ -2,6 +2,10 @@
 description "Master role applied to tabaluga"
 
 default_attributes(
+  :dhcpd => {
+    :first_address => "10.0.63.1",
+    :last_address => "10.0.63.254"
+  },
   :networking => {
     :interfaces => {
       :internal => {
@@ -33,5 +37,7 @@
 
 run_list(
   "role[equinix-ams]",
-  "role[hp-g9]"
+  "role[hp-g9]",
+  "role[gateway]",
+  "recipe[dhcpd]"
 )