diff --git a/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml b/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml
index 7ebdf774ec9c1..5a2b4e4af0d2d 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml
@@ -97,50 +97,24 @@
         - ansible_os_family == "Debian"
         - inventory_hostname in groups.get(osd_group_name, [])
 
-    - import_role:
+    - name: run ceph-config role
+      import_role:
         name: ceph-config
 
-- hosts: mons
-  gather_facts: false
-  any_errors_fatal: true
-  become: True
-  roles:
-    - role: ceph-defaults
-    - role: ceph-common
-    - role: ceph-mon
-
-- hosts: mgrs
-  gather_facts: false
-  any_errors_fatal: true
-  become: True
-  roles:
-    - role: ceph-defaults
-    - role: ceph-common
-    - role: ceph-mgr
-
-- hosts: osds
-  gather_facts: false
-  any_errors_fatal: true
-  become: True
-  roles:
-    - role: ceph-defaults
-    - role: ceph-common
-  tasks:
-    - name: rsync ceph-volume to test nodes on centos
-      synchronize:
-        src: "{{ toxinidir}}/../../../../ceph_volume"
-        dest: "/usr/lib/python2.7/site-packages"
-        use_ssh_args: true
+    - name: run ceph-mon role
+      import_role:
+        name: ceph-mon
       when:
-        - ansible_os_family == "RedHat"
+        - inventory_hostname in groups.get(mon_group_name, [])
 
-    - name: rsync ceph-volume to test nodes on ubuntu
-      synchronize:
-        src: "{{ toxinidir}}/../../../../ceph_volume"
-        dest: "/usr/lib/python2.7/dist-packages"
-        use_ssh_args: true
+    - name: run ceph-mgr role
+      import_role:
+        name: ceph-mgr
       when:
-        - ansible_os_family == "Debian"
+        - inventory_hostname in groups.get(mgr_group_name, [])
 
-    - import_role:
+    - name: run ceph-osd role
+      import_role:
         name: ceph-osd
+      when:
+        - inventory_hostname in groups.get(osd_group_name, [])