diff --git a/common/files/hosts b/common/files/hosts
new file mode 100644
index 00000000..55eb3dc3
--- /dev/null
+++ b/common/files/hosts
@@ -0,0 +1,3 @@
+127.0.0.1	localhost
+::1		localhost
+255.255.255.255	broadcasthost
diff --git a/common/init.sls b/common/init.sls
index 4963ba0a..acba0c39 100644
--- a/common/init.sls
+++ b/common/init.sls
@@ -40,16 +40,20 @@ servo:
     - shell: /bin/bash
     - home: {{ common.servo_home }}
 
-{% for hostname, ip in common.hosts.items() %}
-host-{{ hostname }}:
-  host.present:
-    - name: {{ hostname }}
-    - ip: {{ ip }}
-{% endfor %}
-
 {% for ssh_user in common.ssh_users %}
 sshkey-{{ ssh_user }}:
   ssh_auth.present:
     - user: root
     - source: salt://{{ tpldir }}/ssh/{{ ssh_user }}.pub
 {% endfor %}
+
+/etc/hosts:
+  file.managed:
+    - user: root
+    - mode: 644
+    {% if grains['os'] == 'MacOS' %}
+    - group: wheel
+    {% elif grains['os'] == 'Ubuntu' %}
+    - group: root
+    {% endif %}
+    - source: salt://{{ tlpdir }}/files/hosts
diff --git a/common/map.jinja b/common/map.jinja
index 52f99f44..f13d97b6 100644
--- a/common/map.jinja
+++ b/common/map.jinja
@@ -2,15 +2,6 @@
   set common = salt['grains.filter_by']({
       'defaults': {
         'servo_home': '/home/servo',
-        'hosts': {
-          'servo-master': '96.126.125.232',
-          'servo-linux1': '66.228.48.56',
-          'servo-linux2': '173.255.201.95',
-          'servo-linux3': '45.79.167.177',
-          'servo-linux-android1': '72.14.176.110',
-          'servo-mac1': '208.52.161.130',
-          'servo-mac3': '63.135.170.19',
-        },
         'ssh_users': [
           'ajeffrey',
           'aneeshusa',