diff --git a/rally-jobs/rally-neutron.yaml b/rally-jobs/rally-neutron.yaml
index cc67a070..46dab1b0 100644
--- a/rally-jobs/rally-neutron.yaml
+++ b/rally-jobs/rally-neutron.yaml
@@ -566,3 +566,166 @@
           neutron:
             security_group: -1
             security_group_rule: -1
+
+  CinderVolumes.create_and_delete_volume:
+    -
+      args:
+        size: 1
+      runner:
+        type: "constant"
+        times: 3
+        concurrency: 3
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 2
+      sla:
+        failure_rate:
+          max: 0
+
+  CinderVolumes.create_and_list_volume:
+    -
+      args:
+        size: 1
+        detailed: True
+      runner:
+        type: "constant"
+        times: 3
+        concurrency: 3
+      context:
+        users:
+          tenants: 1
+          users_per_tenant: 1
+      sla:
+        failure_rate:
+          max: 0
+
+  CinderVolumes.create_volume:
+    -
+      args:
+        size: 1
+      runner:
+        type: "constant"
+        times: 2
+        concurrency: 2
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 2
+      sla:
+        failure_rate:
+          max: 0
+
+  CinderVolumes.create_and_delete_snapshot:
+    -
+      args:
+        force: false
+      runner:
+        type: "constant"
+        times: 3
+        concurrency: 3
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 2
+        volumes:
+          size: 1
+      sla:
+        failure_rate:
+          max: 0
+
+  CinderVolumes.create_and_attach_volume:
+    -
+      args:
+        size: 1
+        image:
+          name: "^cirros.*uec$"
+        flavor:
+          name: "m1.tiny"
+      runner:
+        type: "constant"
+        times: 3
+        concurrency: 3
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 2
+      sla:
+        failure_rate:
+          max: 0
+
+  CinderVolumes.create_snapshot_and_attach_volume:
+    -
+      args:
+          volume_type: false
+          size:
+              min: 1
+              max: 2
+      runner:
+        type: "constant"
+        times: 3
+        concurrency: 3
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 1
+        servers:
+          image:
+            name: "^cirros.*uec$"
+          flavor:
+            name: "m1.tiny"
+          servers_per_tenant: 2
+      sla:
+          failure_rate:
+            max: 0
+    -
+      args:
+          volume_type: true
+          size:
+              min: 1
+              max: 2
+      runner:
+        type: "constant"
+        times: 3
+        concurrency: 3
+      context:
+        users:
+          tenants: 1
+          users_per_tenant: 1
+        servers:
+          image:
+            name: "^cirros.*uec$"
+          flavor:
+            name: "m1.tiny"
+          servers_per_tenant: 1
+      sla:
+          failure_rate:
+            max: 0
+
+
+  CinderVolumes.create_nested_snapshots_and_attach_volume:
+    -
+      args:
+          size:
+              min: 1
+              max: 2
+          nested_level:
+              min: 2
+              max: 2
+      runner:
+        type: "constant"
+        times: 2
+        concurrency: 2
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 1
+        servers:
+          image:
+            name: "^cirros.*uec$"
+          flavor:
+            name: "m1.tiny"
+          servers_per_tenant: 2
+      sla:
+          failure_rate:
+            max: 0
diff --git a/rally-jobs/rally.yaml b/rally-jobs/rally.yaml
index 91f0c1c4..37af6492 100755
--- a/rally-jobs/rally.yaml
+++ b/rally-jobs/rally.yaml
@@ -664,169 +664,6 @@
         failure_rate:
           max: 0
 
-  CinderVolumes.create_and_delete_volume:
-    -
-      args:
-        size: 1
-      runner:
-        type: "constant"
-        times: 3
-        concurrency: 3
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-      sla:
-        failure_rate:
-          max: 0
-
-  CinderVolumes.create_and_list_volume:
-    -
-      args:
-        size: 1
-        detailed: True
-      runner:
-        type: "constant"
-        times: 3
-        concurrency: 3
-      context:
-        users:
-          tenants: 1
-          users_per_tenant: 1
-      sla:
-        failure_rate:
-          max: 0
-
-  CinderVolumes.create_volume:
-    -
-      args:
-        size: 1
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-      sla:
-        failure_rate:
-          max: 0
-
-  CinderVolumes.create_and_delete_snapshot:
-    -
-      args:
-        force: false
-      runner:
-        type: "constant"
-        times: 3
-        concurrency: 3
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-        volumes:
-          size: 1
-      sla:
-        failure_rate:
-          max: 0
-
-  CinderVolumes.create_and_attach_volume:
-    -
-      args:
-        size: 1
-        image:
-          name: "^cirros.*uec$"
-        flavor:
-          name: "m1.tiny"
-      runner:
-        type: "constant"
-        times: 3
-        concurrency: 3
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-      sla:
-        failure_rate:
-          max: 0
-
-  CinderVolumes.create_snapshot_and_attach_volume:
-    -
-      args:
-          volume_type: false
-          size:
-              min: 1
-              max: 2
-      runner:
-        type: "constant"
-        times: 3
-        concurrency: 3
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 1
-        servers:
-          image:
-            name: "^cirros.*uec$"
-          flavor:
-            name: "m1.tiny"
-          servers_per_tenant: 2
-      sla:
-          failure_rate:
-            max: 0
-    -
-      args:
-          volume_type: true
-          size:
-              min: 1
-              max: 2
-      runner:
-        type: "constant"
-        times: 3
-        concurrency: 3
-      context:
-        users:
-          tenants: 1
-          users_per_tenant: 1
-        servers:
-          image:
-            name: "^cirros.*uec$"
-          flavor:
-            name: "m1.tiny"
-          servers_per_tenant: 1
-      sla:
-          failure_rate:
-            max: 0
-
-
-  CinderVolumes.create_nested_snapshots_and_attach_volume:
-    -
-      args:
-          size:
-              min: 1
-              max: 2
-          nested_level:
-              min: 2
-              max: 2
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 1
-        servers:
-          image:
-            name: "^cirros.*uec$"
-          flavor:
-            name: "m1.tiny"
-          servers_per_tenant: 2
-      sla:
-          failure_rate:
-            max: 0
-
   GlanceImages.create_and_delete_image:
     -
       args: