diff --git a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
index a81d1ccd3..c74db3327 100644
--- a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
+++ b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
@@ -40,238 +40,228 @@ subnet <%= address.network %> netmask <%= address.netmask %> {
 host oob1.ams.openstreetmap.org {
   hardware ethernet ea:e4:8e:c2:5b:19;
   server-name "oob1.ams.openstreetmap.org";
-  fixed-address oob1.ams.openstreetmap.org;
+  fixed-address 10.0.48.102;
 }
 
 host pdu1.ams.openstreetmap.org {
   hardware ethernet 00:c0:b7:e3:e8:f2;
   server-name "pdu1.ams.openstreetmap.org";
-  fixed-address pdu1.ams.openstreetmap.org;
+  fixed-address 10.0.48.100;
 }
 
 host pdu2.ams.openstreetmap.org {
   hardware ethernet 00:c0:b7:e3:1b:9a;
   server-name "pdu2.ams.openstreetmap.org";
-  fixed-address pdu2.ams.openstreetmap.org;
+  fixed-address 10.0.48.101;
 }
 
 host oob1.dub.openstreetmap.org {
   hardware ethernet 62:bd:62:a6:05:25;
   server-name "oob1.dub.openstreetmap.org";
-  fixed-address oob1.dub.openstreetmap.org;
+  fixed-address 10.0.64.102;
 }
 
 host pdu1.dub.openstreetmap.org {
   hardware ethernet 28:29:86:48:f7:f5;
   server-name "pdu1.dub.openstreetmap.org";
-  fixed-address pdu1.dub.openstreetmap.org;
+  fixed-address 10.0.64.100;
 }
 
 host pdu2.dub.openstreetmap.org {
   hardware ethernet 28:29:86:48:f8:64;
   server-name "pdu2.dub.openstreetmap.org";
-  fixed-address pdu2.dub.openstreetmap.org;
+  fixed-address 10.0.64.101;
 }
 
 host culebre.oob.openstreetmap.org {
   hardware ethernet 3c:ec:ef:2f:29:41;
   server-name "culebre.oob.openstreetmap.org";
-  fixed-address culebre.oob.openstreetmap.org;
+  fixed-address 10.0.65.9;
 }
 
 host dribble.oob.openstreetmap.org {
   hardware ethernet 80:30:e0:3e:e0:a0;
   server-name "dribble.oob.openstreetmap.org";
-  fixed-address dribble.oob.openstreetmap.org;
+  fixed-address 10.0.49.4;
 }
 
 host dulcy.oob.openstreetmap.org {
   hardware ethernet 0c:c4:7a:66:ce:95;
   server-name "dulcy.oob.openstreetmap.org";
-  fixed-address dulcy.oob.openstreetmap.org;
+  fixed-address 10.0.49.9;
 }
 
 host eddie.oob.openstreetmap.org {
   hardware ethernet 0c:c4:7a:d5:8c:c0;
   server-name "eddie.oob.openstreetmap.org";
-  fixed-address eddie.oob.openstreetmap.org;
+  fixed-address 10.0.1.10;
 }
 
 host faffy.oob.openstreetmap.org {
   hardware ethernet 98:f2:b3:21:f6:e2;
   server-name "faffy.oob.openstreetmap.org";
-  fixed-address faffy.oob.openstreetmap.org;
+  fixed-address 10.0.49.3;
 }
 
 host fafnir.oob.openstreetmap.org {
   hardware ethernet 38:63:bb:39:f0:96;
   server-name "fafnir.oob.openstreetmap.org";
-  fixed-address fafnir.oob.openstreetmap.org;
+  fixed-address 10.0.65.2;
 }
 
 host fume.oob.openstreetmap.org {
   hardware ethernet 54:80:28:67:5e:31;
   server-name "fume.oob.openstreetmap.org";
-  fixed-address fume.oob.openstreetmap.org;
+  fixed-address 10.0.65.16;
 }
 
 host grisu.oob.openstreetmap.org {
   hardware ethernet 54:80:28:67:61:03;
   server-name "grisu.oob.openstreetmap.org";
-  fixed-address grisu.oob.openstreetmap.org;
+  fixed-address 10.0.65.17;
 }
 
 host horntail.oob.openstreetmap.org {
   hardware ethernet 3c:ec:ef:82:ac:d2;
   server-name "horntail.oob.openstreetmap.org";
-  fixed-address horntail.oob.openstreetmap.org;
+  fixed-address 10.0.65.10;
 }
 
 host idris.oob.openstreetmap.org {
   hardware ethernet 94:57:a5:50:b5:a0;
   server-name "idris.oob.openstreetmap.org";
-  fixed-address idris.oob.openstreetmap.org;
+  fixed-address 10.0.65.6;
 }
 host karm.oob.openstreetmap.org {
   hardware ethernet 0c:c4:7a:67:cf:c4;
   server-name "karm.oob.openstreetmap.org";
-  fixed-address karm.oob.openstreetmap.org;
+  fixed-address 10.0.49.50;
 }
 
 host konqi.oob.openstreetmap.org {
   hardware ethernet ec:b1:d7:7a:ea:64;
   server-name "konqi.oob.openstreetmap.org";
-  fixed-address konqi.oob.openstreetmap.org;
+  fixed-address 10.0.65.7;
 }
 
 host lockheed.oob.openstreetmap.org {
   hardware ethernet f4:03:43:51:5e:d2;
   server-name "lockheed.oob.openstreetmap.org";
-  fixed-address lockheed.oob.openstreetmap.org;
+  fixed-address 10.0.49.16;
 }
 
 host longma.oob.openstreetmap.org {
   hardware ethernet 3c:ec:ef:2f:6d:4e;
   server-name "longma.oob.openstreetmap.org";
-  fixed-address longma.oob.openstreetmap.org;
+  fixed-address 10.0.65.13;
 }
 
 host muirdris.oob.openstreetmap.org {
   hardware ethernet 80:30:e0:3e:f0:2a;
   server-name "muirdris.oob.openstreetmap.org";
-  fixed-address muirdris.oob.openstreetmap.org;
+  fixed-address 10.0.65.15;
 }
 
 host naga.oob.openstreetmap.org {
   hardware ethernet 94:57:a5:5f:11:f2;
   server-name "naga.oob.openstreetmap.org";
-  fixed-address naga.oob.openstreetmap.org;
+  fixed-address 10.0.65.8;
 }
 
 host norbert.oob.openstreetmap.org {
   hardware ethernet 3c:ec:ef:82:ac:cf;
   server-name "norbert.oob.openstreetmap.org";
-  fixed-address norbert.oob.openstreetmap.org;
+  fixed-address 10.0.49.17;
 }
 
 host odin.oob.openstreetmap.org {
   hardware ethernet ac:1f:6b:c0:59:a3;
   server-name "odin.oob.openstreetmap.org";
-  fixed-address odin.oob.openstreetmap.org;
+  fixed-address 10.0.49.15;
 }
 
 host ridley.oob.openstreetmap.org {
   hardware ethernet d4:85:64:52:2d:d8;
   server-name "ridley.oob.openstreetmap.org";
-  fixed-address ridley.oob.openstreetmap.org;
+  fixed-address 10.0.1.3;
 }
 
 host snap-01.oob.openstreetmap.org {
   hardware ethernet 3c:ec:ef:17:a6:72;
   server-name "snap-01.oob.openstreetmap.org";
-  fixed-address snap-01.oob.openstreetmap.org;
+  fixed-address 10.0.49.49;
 }
 
 host snap-02.oob.openstreetmap.org {
   hardware ethernet 3c:ec:ef:17:a5:37;
   server-name "snap-02.oob.openstreetmap.org";
-  fixed-address snap-02.oob.openstreetmap.org;
+  fixed-address 10.0.1.4;
 }
 
 host snap-03.oob.openstreetmap.org {
   hardware ethernet 3c:ec:ef:82:ab:f2;
   server-name "snap-03.oob.openstreetmap.org";
-  fixed-address snap-03.oob.openstreetmap.org;
+  fixed-address 10.0.65.50;
 }
 
 host smaug.oob.openstreetmap.org {
   hardware ethernet 80:30:e0:3e:d0:62;
   server-name "smaug.oob.openstreetmap.org";
+  fixed-address 10.0.65.14;
   fixed-address smaug.oob.openstreetmap.org;
 }
 
 host spike-01.oob.openstreetmap.org {
   hardware ethernet 3c:a8:2a:11:78:d6;
   server-name "spike-01.oob.openstreetmap.org";
+  fixed-address 10.0.65.3;
   fixed-address spike-01.oob.openstreetmap.org;
 }
 
 host spike-02.oob.openstreetmap.org {
   hardware ethernet 14:58:d0:5d:74:44;
   server-name "spike-02.oob.openstreetmap.org";
-  fixed-address spike-02.oob.openstreetmap.org;
+  fixed-address 10.0.65.4;
 }
 
 host spike-03.oob.openstreetmap.org {
   hardware ethernet 38:63:bb:3a:b0:ce;
   server-name "spike-03.oob.openstreetmap.org";
-  fixed-address spike-03.oob.openstreetmap.org;
+  fixed-address 10.0.65.5;
 }
 
 host spike-06.oob.openstreetmap.org {
   hardware ethernet 38:63:bb:3a:41:a0;
   server-name "spike-06.oob.openstreetmap.org";
-  fixed-address spike-06.oob.openstreetmap.org;
+  fixed-address 10.0.49.11;
 }
 
 host spike-07.oob.openstreetmap.org {
   hardware ethernet 14:02:ec:38:e9:52;
   server-name "spike-07.oob.openstreetmap.org";
-  fixed-address spike-07.oob.openstreetmap.org;
+  fixed-address 10.0.49.12;
 }
 
 host spike-08.oob.openstreetmap.org {
   hardware ethernet 38:63:bb:3a:41:94;
   server-name "spike-08.oob.openstreetmap.org";
-  fixed-address spike-08.oob.openstreetmap.org;
+  fixed-address 10.0.49.13;
 }
 
 host tabaluga.oob.openstreetmap.org {
   hardware ethernet 30:e1:71:5a:a4:6a;
   server-name "tabaluga.oob.openstreetmap.org";
-  fixed-address tabaluga.oob.openstreetmap.org;
-}
-
-host thorn-02.oob.openstreetmap.org {
-  hardware ethernet e4:11:5b:ce:e8:aa;
-  server-name "thorn-02.oob.openstreetmap.org";
-  fixed-address thorn-02.oob.openstreetmap.org;
-}
-
-host thorn-03.oob.openstreetmap.org {
-  hardware ethernet 44:1e:a1:60:1f:92;
-  server-name "thorn-03.oob.openstreetmap.org";
-  fixed-address thorn-03.oob.openstreetmap.org;
+  fixed-address 10.0.49.14;
 }
 
 host vhagar.oob.openstreetmap.org {
   hardware ethernet 80:30:e0:3e:11:a0;
   server-name "vhagar.oob.openstreetmap.org";
-  fixed-address vhagar.oob.openstreetmap.org;
+  fixed-address 10.0.49.5;
 }
 
 host ysera.oob.openstreetmap.org {
   hardware ethernet ac:1f:6b:c1:40:2a;
   server-name "ysera.oob.openstreetmap.org";
-  fixed-address ysera.oob.openstreetmap.org;
+  fixed-address 10.0.1.15;
 }