diff --git a/group_vars/all b/group_vars/all
index 8b4dfb3db..365a450f5 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -19,7 +19,7 @@ dummy:
 #ceph_stable_release: giant # ceph stable release
 
 # This option is needed for _both_ stable and dev version, so please always fill the right version
-# # supported distros are el6, rhel6, f18, f19, opensuse12.2, sles11, centos7 (see http://ceph.com/rpm-firefly/)
+# # for supported distros, see http://ceph.com/rpm-{{ ceph_stable_release }}/
 #ceph_stable_redhat_distro: el7
 
 # ENTERPRISE VERSION
diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 802e82621..05f76e889 100644
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -16,7 +16,7 @@ ceph_stable_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.as
 ceph_stable_release: giant # ceph stable release
 
 # This option is needed for _both_ stable and dev version, so please always fill the right version
-# # supported distros are el6, rhel6, f18, f19, opensuse12.2, sles11, centos7 (see http://ceph.com/rpm-firefly/)
+# # for supported distros, see http://ceph.com/rpm-{{ ceph_stable_release }}/
 ceph_stable_redhat_distro: el7
 
 # ENTERPRISE VERSION
diff --git a/roles/ceph-common/tasks/install_on_redhat.yml b/roles/ceph-common/tasks/install_on_redhat.yml
index efb6b9801..85325c442 100644
--- a/roles/ceph-common/tasks/install_on_redhat.yml
+++ b/roles/ceph-common/tasks/install_on_redhat.yml
@@ -8,6 +8,7 @@
     - ntp
     - hdparm
     - yum-plugin-priorities.noarch
+    - epel-release
 
 - name: Install the Ceph stable repository key
   rpm_key: >
@@ -28,7 +29,7 @@
   when: ceph_stable_ice
 
 - name: Add Ceph stable repository
-  command: "rpm -U http://ceph.com/rpm-{{ ceph_stable_release }}/{{ ceph_stable_redhat_distro }}/noarch/ceph-release-1-0.el6.noarch.rpm creates=/etc/yum.repos.d/ceph.repo"
+  command: "rpm -U http://ceph.com/rpm-{{ ceph_stable_release }}/{{ ceph_stable_redhat_distro }}/noarch/ceph-release-1-0.{{ ceph_stable_redhat_distro|replace('rhel', 'el') }}.noarch.rpm creates=/etc/yum.repos.d/ceph.repo"
   when: ceph_stable
 
 - name: Add Ceph development repository
diff --git a/roles/ceph-mon/tasks/deploy_monitors.yml b/roles/ceph-mon/tasks/deploy_monitors.yml
index f2830d220..59806cc21 100644
--- a/roles/ceph-mon/tasks/deploy_monitors.yml
+++ b/roles/ceph-mon/tasks/deploy_monitors.yml
@@ -18,7 +18,7 @@
     mode=0644
 
 - name: Ceph monitor mkfs
-  command: "ceph-mon --mkfs -i {{ ansible_hostname }} --fsid {{ cluster_uuid.stdout }} --keyring /var/lib/ceph/tmp/keyring.mon.{{ ansible_hostname }} creates=/var/lib/ceph/mon/ceph-{{ ansible_hostname }}/keyring"
+  command: "ceph-mon --mkfs -i {{ ansible_hostname }} --fsid {{ fsid }} --keyring /var/lib/ceph/tmp/keyring.mon.{{ ansible_hostname }} creates=/var/lib/ceph/mon/ceph-{{ ansible_hostname }}/keyring"
 
 - name: Start and add that the monitor service to the init sequence
   service: >