diff --git a/.kitchen.yml b/.kitchen.yml
index 83729aa..5963e97 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -9,9 +9,13 @@ platforms:
 - name: centos-6.4
 - name: centos-5.9
 
+provisioner:
+    name: chef_zero
+
 suites:
 - name: default
   run_list:
+    - "recipe[ceph::repo]"
     - "recipe[ceph]"
   attributes: &defaults
     ceph:
@@ -19,23 +23,19 @@ suites:
         fsid: ae3f1d03-bacd-4a90-b869-1a4fabb107f2
         mon_initial_members:
           - "127.0.0.1"
-- name: repo
-  run_list:
-    - "recipe[ceph::repo]"
-  attributes: *defaults
 - name: osd
   run_list:
-    - "recipe[ceph::osd]"
+    - "role[ceph-osd]"
   attributes: *defaults
 - name: mon
   run_list:
-    - "recipe[ceph::mon]"
+    - "role[ceph-mon]"
   attributes: *defaults
 - name: mds
   run_list:
-    - "recipe[ceph::mds]"
+    - "role[ceph-mds]"
   attributes: *defaults
 - name: radosgw
   run_list:
-    - "recipe[ceph::radosgw]"
+    - "role[ceph-radosgw]"
   attributes: *defaults
diff --git a/roles/ceph-mds.json b/roles/ceph-mds.json
new file mode 100644
index 0000000..2fe9d3b
--- /dev/null
+++ b/roles/ceph-mds.json
@@ -0,0 +1,8 @@
+{
+  "name": "ceph-mds",
+  "description": "Ceph Metadata Server",
+  "run_list": [
+    "recipe[ceph::repo]",
+    "recipe[ceph::mds]"
+  ]
+}
\ No newline at end of file
diff --git a/roles/ceph-mon.json b/roles/ceph-mon.json
new file mode 100644
index 0000000..f44b3aa
--- /dev/null
+++ b/roles/ceph-mon.json
@@ -0,0 +1,8 @@
+{
+  "name": "ceph-mon",
+  "description": "Ceph Monitor",
+  "run_list": [
+    "recipe[ceph::repo]",
+    "recipe[ceph::mon]"
+  ]
+}
\ No newline at end of file
diff --git a/roles/ceph-osd.json b/roles/ceph-osd.json
new file mode 100644
index 0000000..c37b66c
--- /dev/null
+++ b/roles/ceph-osd.json
@@ -0,0 +1,8 @@
+{
+  "name": "ceph-osd",
+  "description": "Ceph Object Storage Device",
+  "run_list": [
+    "recipe[ceph::repo]",
+    "recipe[ceph::osd]"
+  ]
+}
\ No newline at end of file
diff --git a/roles/ceph-radosgw.json b/roles/ceph-radosgw.json
new file mode 100644
index 0000000..722d26d
--- /dev/null
+++ b/roles/ceph-radosgw.json
@@ -0,0 +1,8 @@
+{
+  "name": "ceph-radosgw",
+  "description": "Ceph RADOS Gateway",
+  "run_list": [
+    "recipe[ceph::repo]",
+    "recipe[ceph::radosgw]"
+  ]
+}
\ No newline at end of file