diff --git a/roles/radosgw/tasks/Debian.yml b/roles/radosgw/tasks/Debian.yml
index e535c76e6..1d67f08f0 100644
--- a/roles/radosgw/tasks/Debian.yml
+++ b/roles/radosgw/tasks/Debian.yml
@@ -3,7 +3,7 @@
 #
 
 - name: Copy RGW bootstrap key
-  copy: src=fetch/{{ hostvars[groups['mons'][0]]['ansible_hostname'] }}/etc/ceph/keyring.radosgw.gateway dest=/etc/ceph/keyring.radosgw.gateway owner=root group=root mode=600
+  copy: src=fetch/{{ hostvars[groups['mons'][0]]['ansible_fqdn'] }}/etc/ceph/keyring.radosgw.gateway dest=/etc/ceph/keyring.radosgw.gateway owner=root group=root mode=600
   when: cephx
 
 - name: Set RGW bootstrap key permissions
@@ -46,7 +46,7 @@
 #
 
 - name: Create RGW directory
-  file: path=/var/lib/ceph/radosgw/{{ ansible_hostname }} state=directory owner=root group=root mode=0644
+  file: path=/var/lib/ceph/radosgw/{{ ansible_fqdn }} state=directory owner=root group=root mode=0644
 
 - name: Enable Rados Gateway vhost and disable default site
   command: "{{ item }}"
diff --git a/roles/radosgw/tasks/RedHat.yml b/roles/radosgw/tasks/RedHat.yml
index cbbdcd01d..64579ebac 100644
--- a/roles/radosgw/tasks/RedHat.yml
+++ b/roles/radosgw/tasks/RedHat.yml
@@ -3,7 +3,7 @@
 #
 
 - name: Copy RGW bootstrap key
-  copy: src=fetch/{{ hostvars[groups['mons'][0]]['ansible_hostname'] }}/etc/ceph/keyring.radosgw.gateway dest=/etc/ceph/keyring.radosgw.gateway owner=root group=root mode=600
+  copy: src=fetch/{{ hostvars[groups['mons'][0]]['ansible_fqdn'] }}/etc/ceph/keyring.radosgw.gateway dest=/etc/ceph/keyring.radosgw.gateway owner=root group=root mode=600
   when: cephx
 
 - name: Set RGW bootstrap key permissions
@@ -37,7 +37,7 @@
 #
 
 - name: Create RGW directory
-  file: path=/var/lib/ceph/radosgw/{{ ansible_hostname }} state=directory owner=root group=root mode=0644
+  file: path=/var/lib/ceph/radosgw/{{ ansible_fqdn }} state=directory owner=root group=root mode=0644
 
 - name: Install s3gw.fcgi script
   copy: src=s3gw.fcgi dest=/var/www/s3gw.fcgi mode=0555 owner=root group=root