diff --git a/rally/rally_scenarios.json b/rally/rally_scenarios.json
index e2b258f..58dc66d 100644
--- a/rally/rally_scenarios.json
+++ b/rally/rally_scenarios.json
@@ -1,14 +1,18 @@
 {% set flavor_name = flavor_name or "m1.tiny" %}
-{% set image_name = image_name or "Test2VM" %}
+{% set flavor_name_ubuntu = flavor_name_ubuntu or "m1.medium" %}
+{% set image_name = image_name or "testvm" %}
+{% set image_name_ubuntu = image_name_ubuntu or "Ubuntu" %}
 {% set volume_type = volume_type or "default" %}
 {% set availability_zone = "nova" %}
 {% set concurrency = 1 %}
 {% set volume_size = 1 %}
-{% set times = 3 %}
-{% set users = 2 %}
-{% set tenants = 3 %}
+{% set times = 1 %}
+{% set users = 1 %}
+{% set tenants = 1 %}
 {% set rbd_image = "/home/rally/cvp-configuration/cirros-0.3.4-x86_64-disk.img" %}
 {% set heat_template = "/home/rally/cvp-configuration/rally/default.yaml.template" %}
+{% set ext_net_name = "floating" %}
+{% set script_file = script_file or "cvp-configuration/rally/instance_test.sh" %}
 {
 "KeystoneBasic.authenticate_user_and_validate_token": [
         {
@@ -25,6 +29,214 @@
             }
         }
     ],
+    "Authenticate.validate_cinder": [
+        {
+            "args": {
+                "repetitions": 2
+            },
+            "runner": {
+                "type": "constant",
+                "times": {{times}},
+                "concurrency": {{concurrency}}
+            },
+            "context": {
+                "users": {
+                    "users_per_tenant": {{users}},
+                    "tenants": {{tenants}}
+                }
+            },
+            "sla": {
+                "failure_rate": {
+                    "max": 0
+                }
+            }
+        }
+    ],
+    "Authenticate.validate_glance": [
+        {
+            "args": {
+                "repetitions": 2
+            },
+            "runner": {
+                "type": "constant",
+                "times": {{times}},
+                "concurrency": {{concurrency}}
+            },
+            "context": {
+                "users": {
+                    "users_per_tenant": {{users}},
+                    "tenants": {{tenants}}
+                }
+            },
+            "sla": {
+                "failure_rate": {
+                    "max": 0
+                }
+            }
+        }
+    ],
+    "Authenticate.validate_heat": [
+        {
+            "args": {
+                "repetitions": 2
+            },
+            "runner": {
+                "type": "constant",
+                "times": {{times}},
+                "concurrency": {{concurrency}}
+            },
+            "context": {
+                "users": {
+                    "users_per_tenant": {{users}},
+                    "tenants": {{tenants}}
+                }
+            },
+            "sla": {
+                "failure_rate": {
+                    "max": 0
+                }
+            }
+        }
+    ],
+    "Authenticate.validate_nova": [
+        {
+            "args": {
+                "repetitions": 2
+            },
+            "runner": {
+                "type": "constant",
+                "times": {{times}},
+                "concurrency": {{concurrency}}
+            },
+            "context": {
+                "users": {
+                    "users_per_tenant": {{users}},
+                    "tenants": {{tenants}}
+                }
+            },
+            "sla": {
+                "failure_rate": {
+                    "max": 0
+                }
+            }
+        }
+    ],
+    "Authenticate.validate_neutron": [
+        {
+            "args": {
+                "repetitions": 2
+            },
+            "runner": {
+                "type": "constant",
+                "times": {{times}},
+                "concurrency": {{concurrency}}
+            },
+            "context": {
+                "users": {
+                    "users_per_tenant": {{users}},
+                    "tenants": {{tenants}}
+                }
+            },
+            "sla": {
+                "failure_rate": {
+                    "max": 0
+                }
+            }
+        }
+    ],
+    "VMTasks.boot_runcommand_delete": [
+        {
+            "args": {
+                "flavor": {
+                    "name": "{{flavor_name_ubuntu}}"
+                },
+                "image": {
+                    "name": "{{image_name_ubuntu}}"
+                },
+                "volume_args": {
+                    "size": 10
+                },
+                "floating_network": "{{ext_net_name}}",
+                "use_floating_ip": true,
+                "wait_for_ping": false,
+                "force_delete": false,
+                "command": {
+                    "interpreter": "/bin/sh",
+                    "script_file": "{{script_file}}"
+                },
+                "username": "ubuntu"
+            },
+            "runner": {
+                "type": "constant",
+                "times": 1,
+                "concurrency": 1
+            },
+            "context": {
+                "users": {
+                    "tenants": 1,
+                    "users_per_tenant": 1
+                },
+                "network": {}
+            }
+        }
+    ],
+   "NovaServers.boot_and_migrate_server": [
+        {
+            "args": {
+                "flavor": {
+                    "name": "{{flavor_name}}"
+                },
+                "image": {
+                    "name": "{{image_name}}"
+                }
+            },
+            "runner": {
+                "type": "constant",
+                "times": {{times}},
+                "concurrency": {{concurrency}}
+            },
+            "context": {
+                "users": {
+                    "users_per_tenant": {{users}},
+                    "tenants": {{tenants}}
+                }
+            },
+            "sla": {
+                "failure_rate": {
+                    "max": 0
+                }
+            }
+        }
+    ],
+   "NovaServers.boot_and_live_migrate_server": [
+        {
+            "args": {
+                "flavor": {
+                    "name": "{{flavor_name}}"
+                },
+                "image": {
+                    "name": "{{image_name}}"
+                },
+                "block_migration": false
+            },
+            "runner": {
+                "type": "constant",
+                "concurrency": {{concurrency}},
+                "times": {{times}}
+            },
+            "context": {
+                "users": {
+                    "users_per_tenant": {{users}},
+                    "tenants": {{tenants}}
+                }
+            },
+            "sla": {
+                "failure_rate": {
+                    "max": 0
+                }
+            }
+        }
+    ],
   "NovaServers.boot_and_associate_floating_ip": [
     {
       "runner": {
@@ -67,7 +279,50 @@
       }
     }
   ],
-  "NovaServers.boot_and_list_server": [
+  "NovaServers.boot_and_delete_server": [
+    {
+      "args": {
+        "flavor": {
+          "name": "{{flavor_name_ubuntu}}"
+        },
+      "image": {
+        "name": "{{image_name_ubuntu}}"
+      },
+      "detailed": true,
+      "auto_assign_nic": true,
+      "availability_zone": "{{availability_zone}}"
+      },
+      "runner": {
+        "type": "constant",
+        "concurrency": {{concurrency}},
+        "times": {{times}}
+      },
+      "context": {
+        "users": {
+          "tenants": {{users}},
+          "users_per_tenant": {{tenants}}
+        },
+        "network": {},
+        "quotas": {
+          "nova": {
+            "instances": -1,
+            "cores": -1,
+            "ram": -1,
+            "floating_ips": -1,
+            "key_pairs": -1,
+            "security_groups": -1,
+            "security_group_rules": -1
+          }
+        }
+      },
+      "sla": {
+        "failure_rate": {
+          "max": 0
+          }
+      }
+    }
+  ],
+  "NovaServers.boot_and_delete_server": [
     {
       "args": {
         "flavor": {
diff --git a/rally/rally_scenarios_full.json b/rally/rally_scenarios_full.json
index 6df09ba..bdcc277 100644
--- a/rally/rally_scenarios_full.json
+++ b/rally/rally_scenarios_full.json
@@ -1,11 +1,13 @@
 {% set flavor_name = flavor_name or "m1.tiny" %}
-{% set image_name = image_name or "Test2VM" %}
+{% set flavor_name_ubuntu = flavor_name_ubuntu or "m1.medium" %}
+{% set image_name = image_name or "testvm" %}
+{% set image_name_ubuntu = image_name_ubuntu or "Ubuntu" %}
 {% set volume_type = volume_type or "default" %}
 {% set availability_zone = "nova" %}
 {% set concurrency = 10 %}
 {% set volume_size = 1 %}
 {% set times = 100 %}
-{% set users = 2 %}
+{% set users = 3 %}
 {% set tenants = 3 %}
 {% set rbd_image = "/home/rally/cvp-configuration/cirros-0.3.4-x86_64-disk.img" %}
 {% set heat_template = "/home/rally/cvp-configuration/rally/default.yaml.template" %}
@@ -25,6 +27,178 @@
             }
         }
     ],
+    "Authenticate.validate_cinder": [
+        {
+            "args": {
+                "repetitions": 2
+            },
+            "runner": {
+                "type": "constant",
+                "times": {{times}},
+                "concurrency": {{concurrency}}
+            },
+            "context": {
+                "users": {
+                    "users_per_tenant": {{users}},
+                    "tenants": {{tenants}}
+                }
+            },
+            "sla": {
+                "failure_rate": {
+                    "max": 0
+                }
+            }
+        }
+    ],
+    "Authenticate.validate_glance": [
+        {
+            "args": {
+                "repetitions": 2
+            },
+            "runner": {
+                "type": "constant",
+                "times": {{times}},
+                "concurrency": {{concurrency}}
+            },
+            "context": {
+                "users": {
+                    "users_per_tenant": {{users}},
+                    "tenants": {{tenants}}
+                }
+            },
+            "sla": {
+                "failure_rate": {
+                    "max": 0
+                }
+            }
+        }
+    ],
+    "Authenticate.validate_heat": [
+        {
+            "args": {
+                "repetitions": 2
+            },
+            "runner": {
+                "type": "constant",
+                "times": {{times}},
+                "concurrency": {{concurrency}}
+            },
+            "context": {
+                "users": {
+                    "users_per_tenant": {{users}},
+                    "tenants": {{tenants}}
+                }
+            },
+            "sla": {
+                "failure_rate": {
+                    "max": 0
+                }
+            }
+        }
+    ],
+    "Authenticate.validate_nova": [
+        {
+            "args": {
+                "repetitions": 2
+            },
+            "runner": {
+                "type": "constant",
+                "times": {{times}},
+                "concurrency": {{concurrency}}
+            },
+            "context": {
+                "users": {
+                    "users_per_tenant": {{users}},
+                    "tenants": {{tenants}}
+                }
+            },
+            "sla": {
+                "failure_rate": {
+                    "max": 0
+                }
+            }
+        }
+    ],
+    "Authenticate.validate_neutron": [
+        {
+            "args": {
+                "repetitions": 2
+            },
+            "runner": {
+                "type": "constant",
+                "times": {{times}},
+                "concurrency": {{concurrency}}
+            },
+            "context": {
+                "users": {
+                    "users_per_tenant": {{users}},
+                    "tenants": {{tenants}}
+                }
+            },
+            "sla": {
+                "failure_rate": {
+                    "max": 0
+                }
+            }
+        }
+    ],
+   "NovaServers.boot_and_migrate_server": [
+        {
+            "args": {
+                "flavor": {
+                    "name": "{{flavor_name}}"
+                },
+                "image": {
+                    "name": "{{image_name}}"
+                }
+            },
+            "runner": {
+                "type": "constant",
+                "times": {{times}},
+                "concurrency": {{concurrency}}
+            },
+            "context": {
+                "users": {
+                    "users_per_tenant": {{users}},
+                    "tenants": {{tenants}}
+                }
+            },
+            "sla": {
+                "failure_rate": {
+                    "max": 0
+                }
+            }
+        }
+    ],
+   "NovaServers.boot_and_live_migrate_server": [
+        {
+            "args": {
+                "flavor": {
+                    "name": "{{flavor_name}}"
+                },
+                "image": {
+                    "name": "{{image_name}}"
+                },
+                "block_migration": false
+            },
+            "runner": {
+                "type": "constant",
+                "concurrency": {{concurrency}},
+                "times": {{times}}
+            },
+            "context": {
+                "users": {
+                    "users_per_tenant": {{users}},
+                    "tenants": {{tenants}}
+                }
+            },
+            "sla": {
+                "failure_rate": {
+                    "max": 0
+                }
+            }
+        }
+    ],
   "NovaServers.boot_and_associate_floating_ip": [
     {
       "runner": {
@@ -67,7 +241,50 @@
       }
     }
   ],
-  "NovaServers.boot_and_list_server": [
+  "NovaServers.boot_and_delete_server": [
+    {
+      "args": {
+        "flavor": {
+          "name": "{{flavor_name_ubuntu}}"
+        },
+      "image": {
+        "name": "{{image_name_ubuntu}}"
+      },
+      "detailed": true,
+      "auto_assign_nic": true,
+      "availability_zone": "{{availability_zone}}"
+      },
+      "runner": {
+        "type": "constant",
+        "concurrency": {{concurrency}},
+        "times": {{times}}
+      },
+      "context": {
+        "users": {
+          "tenants": {{users}},
+          "users_per_tenant": {{tenants}}
+        },
+        "network": {},
+        "quotas": {
+          "nova": {
+            "instances": -1,
+            "cores": -1,
+            "ram": -1,
+            "floating_ips": -1,
+            "key_pairs": -1,
+            "security_groups": -1,
+            "security_group_rules": -1
+          }
+        }
+      },
+      "sla": {
+        "failure_rate": {
+          "max": 0
+          }
+      }
+    }
+  ],
+  "NovaServers.boot_and_delete_server": [
     {
       "args": {
         "flavor": {