diff --git a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
index bac7cb5759..ee62fecc1c 100644
--- a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
@@ -8,29 +8,6 @@
     cmd: ruby /etc/puppet/modules/osnailyfacter/modular/astute/enable_quorum.rb
     timeout: 180
 
-- id: ceph_ready_check
-  type: shell
-  role: [primary-controller]
-  condition: "settings:storage.objects_ceph.value == true or settings:storage.images_ceph.value == true or settings:storage.volumes_ceph.value == true or settings:storage.ephemeral_ceph.value == true"
-  requires: [post_deployment_start]
-  required_for: [enable_rados, upload_cirros]
-  parameters:
-    cmd: ruby /etc/puppet/modules/osnailyfacter/modular/astute/ceph_ready_check.rb
-    timeout: 1800
-
-- id: enable_rados
-  type: puppet
-  role: [primary-controller, controller]
-  condition: "settings:storage.objects_ceph.value == true"
-  requires: [post_deployment_start]
-  required_for: [upload_cirros, post_deployment_end]
-  parameters:
-    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/astute/enable_rados.pp
-    puppet_modules: /etc/puppet/modules
-    timeout: 180
-    cwd: /
-
-
 - id: upload_cirros
   type: shell
   role: [primary-controller]
@@ -140,7 +117,6 @@
     cmd: rm -f /etc/hiera/nodes.yaml
     retries: 1
 
-
 - id: copy_keys
   type: copy_files
   role: '*'
@@ -156,10 +132,6 @@
         dst: /var/lib/astute/nova/nova.pub
       - src: /var/lib/fuel/keys/{CLUSTER_ID}/nova/nova
         dst: /var/lib/astute/nova/nova
-      - src: /var/lib/fuel/keys/{CLUSTER_ID}/ceph/ceph.pub
-        dst: /var/lib/astute/ceph/ceph.pub
-      - src: /var/lib/fuel/keys/{CLUSTER_ID}/ceph/ceph
-        dst: /var/lib/astute/ceph/ceph
       - src: /var/lib/fuel/keys/{CLUSTER_ID}/mysql/mysql.pub
         dst: /var/lib/astute/mysql/mysql.pub
       - src: /var/lib/fuel/keys/{CLUSTER_ID}/mysql/mysql
@@ -175,7 +147,7 @@
   requires: [pre_deployment_start]
   required_for: [copy_keys]
   parameters:
-    cmd: sh /etc/puppet/modules/osnailyfacter/modular/astute/generate_keys.sh -i {CLUSTER_ID} -o 'mongodb' -s 'neutron nova ceph mysql' -p /var/lib/fuel/keys/
+    cmd: sh /etc/puppet/modules/osnailyfacter/modular/astute/generate_keys.sh -i {CLUSTER_ID} -o 'mongodb' -s 'neutron nova mysql' -p /var/lib/fuel/keys/
     timeout: 180
 
 - id: sync_time
diff --git a/deployment/puppet/osnailyfacter/modular/roles/ceph-osd.pp b/deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp
similarity index 100%
rename from deployment/puppet/osnailyfacter/modular/roles/ceph-osd.pp
rename to deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp
diff --git a/deployment/puppet/osnailyfacter/modular/astute/ceph_ready_check.rb b/deployment/puppet/osnailyfacter/modular/ceph/ceph_ready_check.rb
similarity index 100%
rename from deployment/puppet/osnailyfacter/modular/astute/ceph_ready_check.rb
rename to deployment/puppet/osnailyfacter/modular/ceph/ceph_ready_check.rb
diff --git a/deployment/puppet/osnailyfacter/modular/astute/enable_rados.pp b/deployment/puppet/osnailyfacter/modular/ceph/enable_rados.pp
similarity index 100%
rename from deployment/puppet/osnailyfacter/modular/astute/enable_rados.pp
rename to deployment/puppet/osnailyfacter/modular/ceph/enable_rados.pp
diff --git a/deployment/puppet/osnailyfacter/modular/ceph/tasks.yaml b/deployment/puppet/osnailyfacter/modular/ceph/tasks.yaml
index 8f60406428..0c4e85fced 100644
--- a/deployment/puppet/osnailyfacter/modular/ceph/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/ceph/tasks.yaml
@@ -1,3 +1,44 @@
+# PRE_DEPLOYMENT Tasks
+#
+
+- id: copy_keys_ceph
+  type: copy_files
+  role: '*'
+  required_for: [pre_deployment_end]
+  requires: [generate_keys_ceph]
+  parameters:
+    files:
+      - src: /var/lib/fuel/keys/{CLUSTER_ID}/ceph/ceph.pub
+        dst: /var/lib/astute/ceph/ceph.pub
+      - src: /var/lib/fuel/keys/{CLUSTER_ID}/ceph/ceph
+        dst: /var/lib/astute/ceph/ceph
+    permissions: '0600'
+    dir_permissions: '0700'
+
+- id: generate_keys_ceph
+  type: shell
+  role: master
+  requires: [pre_deployment_start]
+  required_for: [copy_keys_ceph]
+  parameters:
+    cmd: sh /etc/puppet/modules/osnailyfacter/modular/astute/generate_keys.sh -i {CLUSTER_ID} -s 'ceph' -p /var/lib/fuel/keys/
+    timeout: 180
+
+
+#
+# DEPLOYMENT Tasks
+#
+
+- id: top-role-ceph-osd
+  type: puppet
+  groups: [ceph-osd]
+  required_for: [deploy_end]
+  requires: [hosts, firewall]
+  parameters:
+    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/ceph/ceph-osd.pp
+    puppet_modules: /etc/puppet/modules
+    timeout: 3600
+
 - id: ceph-radosgw
   type: puppet
   groups: [primary-controller, controller]
@@ -33,3 +74,31 @@
     timeout: 3600
   test_post:
     cmd: ruby /etc/puppet/modules/osnailyfacter/modular/ceph/compute_post.rb
+
+#
+# POST_DEPLOYMENT Tasks
+#
+
+- id: ceph_ready_check
+  type: shell
+  role: [primary-controller]
+  condition: "settings:storage.objects_ceph.value == true or settings:storage.images_ceph.value == true or settings:storage.volumes_ceph.value == true or settings:storage.ephemeral_ceph.value == true"
+  requires: [post_deployment_start]
+  required_for: [enable_rados, upload_cirros]
+  parameters:
+    cmd: ruby /etc/puppet/modules/osnailyfacter/modular/ceph/ceph_ready_check.rb
+    timeout: 1800
+
+- id: enable_rados
+  type: puppet
+  role: [primary-controller, controller]
+  condition: "settings:storage.objects_ceph.value == true"
+  requires: [post_deployment_start]
+  required_for: [upload_cirros, post_deployment_end]
+  parameters:
+    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/ceph/enable_rados.pp
+    puppet_modules: /etc/puppet/modules
+    timeout: 180
+    cwd: /
+
+
diff --git a/deployment/puppet/osnailyfacter/modular/roles/tasks.yaml b/deployment/puppet/osnailyfacter/modular/roles/tasks.yaml
index 5e6b936ad1..1f96e16feb 100644
--- a/deployment/puppet/osnailyfacter/modular/roles/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/roles/tasks.yaml
@@ -27,16 +27,6 @@
     puppet_modules: /etc/puppet/modules
     timeout: 3600
 
-- id: top-role-ceph-osd
-  type: puppet
-  groups: [ceph-osd]
-  required_for: [deploy_end]
-  requires: [hosts, firewall]
-  parameters:
-    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/roles/ceph-osd.pp
-    puppet_modules: /etc/puppet/modules
-    timeout: 3600
-
 - id: top-role-primary-mongo
   type: puppet
   groups: [primary-mongo]
diff --git a/tests/noop/spec/hosts/roles/ceph-osd_spec.rb b/tests/noop/spec/hosts/ceph/ceph-osd_spec.rb
similarity index 77%
rename from tests/noop/spec/hosts/roles/ceph-osd_spec.rb
rename to tests/noop/spec/hosts/ceph/ceph-osd_spec.rb
index 9a34752f49..68246a8c9b 100644
--- a/tests/noop/spec/hosts/roles/ceph-osd_spec.rb
+++ b/tests/noop/spec/hosts/ceph/ceph-osd_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'shared-examples'
-manifest = 'roles/ceph-osd.pp'
+manifest = 'ceph/ceph-osd.pp'
 
 describe manifest do
   test_ubuntu_and_centos manifest
diff --git a/tests/noop/spec/hosts/astute/enable_rados_spec.rb b/tests/noop/spec/hosts/ceph/enable_rados_spec.rb
similarity index 94%
rename from tests/noop/spec/hosts/astute/enable_rados_spec.rb
rename to tests/noop/spec/hosts/ceph/enable_rados_spec.rb
index 97a92b2d5b..069084da9f 100644
--- a/tests/noop/spec/hosts/astute/enable_rados_spec.rb
+++ b/tests/noop/spec/hosts/ceph/enable_rados_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'shared-examples'
-manifest = 'astute/enable_rados.pp'
+manifest = 'ceph/enable_rados.pp'
 
 describe manifest do
   shared_examples 'catalog' do