diff --git a/ceph/common.sls b/ceph/common.sls
index 872a047..4e17805 100644
--- a/ceph/common.sls
+++ b/ceph/common.sls
@@ -15,28 +15,3 @@
       keyring: {{ keyring }}
 
 {% endfor %}
-
-#{%- if not salt['user.info']('ceph') %}
-#
-#ceph_user:
-#  user.present:
-#  - name: ceph
-#  - home: /var/lib/ceph
-#  - uid: 304
-#  - gid: 304
-#  - shell: /bin/false
-#  - system: True
-#  - require_in:
-#    {%- if pillar.ceph.get('osd', {}).get('enabled', False) %}
-#    - pkg: ceph_osd_packages
-#    {%- endif %}
-#
-#ceph_group:
-#  group.present:
-#  - name: ceph
-#  - gid: 304
-#  - system: True
-#  - require_in:
-#    - user: ceph_user
-#
-#{%- endif %}
diff --git a/ceph/files/jewel/ceph.conf.Debian b/ceph/files/jewel/ceph.conf.Debian
index 7cce8f1..721786c 100644
--- a/ceph/files/jewel/ceph.conf.Debian
+++ b/ceph/files/jewel/ceph.conf.Debian
@@ -67,7 +67,7 @@
 {%- for disk_id, disk in osd.disk.iteritems() %}
 {% set id = osd.host_id~disk_id %}
 [osd.{{ id }}]
-host = {{ grains.nodename }}
+host = {{ grains.host }}
 osd journal = {{ disk.journal }}
 {%- endfor %}
 
diff --git a/ceph/files/kraken/ceph.conf.Debian b/ceph/files/kraken/ceph.conf.Debian
index 7cce8f1..721786c 100644
--- a/ceph/files/kraken/ceph.conf.Debian
+++ b/ceph/files/kraken/ceph.conf.Debian
@@ -67,7 +67,7 @@
 {%- for disk_id, disk in osd.disk.iteritems() %}
 {% set id = osd.host_id~disk_id %}
 [osd.{{ id }}]
-host = {{ grains.nodename }}
+host = {{ grains.host }}
 osd journal = {{ disk.journal }}
 {%- endfor %}
 
diff --git a/ceph/mon.sls b/ceph/mon.sls
index 759ab6e..0cdd7dc 100644
--- a/ceph/mon.sls
+++ b/ceph/mon.sls
@@ -16,13 +16,13 @@
 
 cluster_secret_key:
   cmd.run:
-  - name: "ceph-authtool --create-keyring /etc/ceph/ceph.mon.{{ grains.nodename }}.keyring --gen-key -n mon. --cap mon 'allow *'"
-  - unless: "test -f /etc/ceph/ceph.mon.{{ grains.nodename }}.keyring"
+  - name: "ceph-authtool --create-keyring /etc/ceph/ceph.mon.{{ grains.host }}.keyring --gen-key -n mon. --cap mon 'allow *'"
+  - unless: "test -f /etc/ceph/ceph.mon.{{ grains.host }}.keyring"
 
 add_admin_keyring_to_mon_keyring:
   cmd.run:
-  - name: "ceph-authtool /etc/ceph/ceph.mon.{{ grains.nodename }}.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring"
-  - unless: "test -f /var/lib/ceph/mon/ceph-{{ grains.nodename }}/done"
+  - name: "ceph-authtool /etc/ceph/ceph.mon.{{ grains.host }}.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring"
+  - unless: "test -f /var/lib/ceph/mon/ceph-{{ grains.host }}/done"
 
 generate_monmap:
   cmd.run:
@@ -30,14 +30,14 @@
   - unless: "test -f /tmp/monmap"
 
 
-#/var/lib/ceph/mon/ceph-{{ grains.nodename }}:
+#/var/lib/ceph/mon/ceph-{{ grains.host }}:
 #  file.directory:
 #    - user: ceph
 #    - group: ceph
 #    - mode: 655
 #    - makedirs: True
 
-/etc/ceph/ceph.mon.{{ grains.nodename }}.keyring:
+/etc/ceph/ceph.mon.{{ grains.host }}.keyring:
   file.managed:
   - user: ceph
   - group: ceph
@@ -46,15 +46,15 @@
 
 populate_monmap:
   cmd.run:
-  - name: "sudo -u ceph ceph-mon --mkfs -i {{ grains.nodename }} --monmap /tmp/monmap"
-  - unless: "test -f /var/lib/ceph/mon/ceph-{{ grains.nodename }}/kv_backend"
+  - name: "sudo -u ceph ceph-mon --mkfs -i {{ grains.host }} --monmap /tmp/monmap"
+  - unless: "test -f /var/lib/ceph/mon/ceph-{{ grains.host }}/kv_backend"
 
-/var/lib/ceph/mon/ceph-{{ grains.nodename }}/keyring:
+/var/lib/ceph/mon/ceph-{{ grains.host }}/keyring:
   file.managed:
   - source: salt://ceph/files/mon_keyring
   - template: jinja
 
-/var/lib/ceph/mon/ceph-{{ grains.nodename }}/done:
+/var/lib/ceph/mon/ceph-{{ grains.host }}/done:
   file.managed:
     - user: ceph
     - group: ceph
@@ -63,7 +63,7 @@
 mon_services:
   service.running:
   - enable: true
-  - names: [ceph-mon@{{ grains.nodename }}]
+  - names: [ceph-mon@{{ grains.host }}]
   - watch:
     - file: /etc/ceph/ceph.conf
   - require: