diff --git a/roles/cephadm/tasks/main.yml b/roles/cephadm/tasks/main.yml
index e2d02615f1710b7b30257db47c842c60100f7d36..d4559382e79fd4ab8f7418f23122f606f77e84d4 100644
--- a/roles/cephadm/tasks/main.yml
+++ b/roles/cephadm/tasks/main.yml
@@ -65,43 +65,18 @@
     dest: "/var/run/ceph/{{ ceph_fsid }}/cluster.yml"
   become: True
 
-- name: Check Ceph Orchestrator state
-  command:
-    cmd: >
-         cephadm shell --
-         ceph orch status --detail
-  become: True
-
-- name: Apply cluster spec
-  command:
-    cmd: >
-         cephadm shell --
-         ceph orch apply -i /var/run/ceph/cluster.yml
+- name: Template out command spec
+  template:
+    src: templates/commands.sh.j2
+    dest: "/var/run/ceph/{{ ceph_fsid }}/commands.sh"
   become: True
 
-- name: Add osds
+- name: Run commands
   command:
     cmd: >
          cephadm shell --
-         ceph orch daemon add osd {{ item }}
+         bash /var/run/ceph/commands.sh
   become: True
-  loop: "{{ cephadm_ceph_osd_devices }}"
-
-- name: Create and initialise pools for OpenStack services
-  command:
-    cmd: >
-         cephadm shell --
-         ceph osd pool create {{ item }}
-  with_items: "{{ cephadm_ceph_pools }}"
-  become: true
-
-- name: Create users for OpenStack services
-  command:
-    cmd: >
-         cephadm shell --
-         ceph auth get-or-create {{ item }}
-  become: true
-  with_items: "{{ cephadm_ceph_users }}"
 
 # TODO(mnasiadka): Fix merge_configs to support tabs
 - name: Generate ceph.conf without tabs
@@ -112,10 +87,5 @@
       mon_host = {% for host in groups['all'] %} {{ hostvars[host]['ansible_'+api_interface_name].ipv4.address }} {% if not loop.last %},{% endif %} {% endfor %}
   copy:
     content: "{{ ceph_conf_fixed }}"
-    dest: /etc/ceph/ceph.conf
-  become: True
-
-- name: Check ceph health
-  command:
-    cmd: cephadm shell -- ceph health detail
+    dest: "/etc/ceph/ceph.conf.fixed"
   become: True
diff --git a/roles/cephadm/templates/commands.sh.j2 b/roles/cephadm/templates/commands.sh.j2
new file mode 100644
index 0000000000000000000000000000000000000000..dfdf79ec1fda26aca823f5c8ab73f3cc7d22c2d6
--- /dev/null
+++ b/roles/cephadm/templates/commands.sh.j2
@@ -0,0 +1,23 @@
+# Status
+ceph orch status --detail
+
+# Apply cluster spec
+ceph orch apply -i /var/run/ceph/cluster.yml
+
+# OSDs
+{% for osd in cephadm_ceph_osd_devices %}
+ceph orch daemon add osd {{ osd }}
+{% endfor %}
+
+# Pools
+{% for pool in cephadm_ceph_pools %}
+ceph osd pool create {{ pool }}
+{% endfor %}
+
+# Users
+{% for user in cephadm_ceph_users %}
+ceph auth get-or-create {{ user }}
+{% endfor %}
+
+# Health
+ceph health detail
diff --git a/tests/run.yml b/tests/run.yml
index 31bf01f0169e30ef30ec6f4c998a157d07c49e4f..bc66401f48bbd5d55ea7284b5bdc70e046a71ef2 100644
--- a/tests/run.yml
+++ b/tests/run.yml
@@ -361,7 +361,7 @@
         - name: copy ceph.conf to enabled services
           copy:
             remote_src: True
-            src: "/etc/ceph/ceph.conf"
+            src: "/etc/ceph/ceph.conf.fixed"
             dest: "/etc/kolla/config/{{ item.name }}/ceph.conf"
           with_items: "{{ cephadm_kolla_ceph_services }}"