diff --git a/rally/nova/nova-boot-bounce-delete-cc.yml b/rally/nova/nova-boot-bounce-delete-cc.yml
index c89463f81..a00a6a822 100644
--- a/rally/nova/nova-boot-bounce-delete-cc.yml
+++ b/rally/nova/nova-boot-bounce-delete-cc.yml
@@ -11,8 +11,7 @@
           name: {{flavor_name}}
         image:
           name: {{image_name}}
-        nics:
-          - net-id: {{net_id}}
+        auto_assign_nic: true
         actions:
           - hard_reboot: 3
           - soft_reboot: 3
@@ -23,6 +22,9 @@
         times: {{times}}
         type: "constant"
       context:
+        network:
+          start_cidr: "10.0.0.0/16"
+          networks_per_tenant: 1
         users:
           tenants: 1
           users_per_tenant: 1
diff --git a/rally/nova/nova-boot-list-cc.yml b/rally/nova/nova-boot-list-cc.yml
index d826c6750..7cbfbc60a 100644
--- a/rally/nova/nova-boot-list-cc.yml
+++ b/rally/nova/nova-boot-list-cc.yml
@@ -11,14 +11,16 @@
           name: {{flavor_name}}
         image:
           name: {{image_name}}
-        nics:
-          - net-id: {{net_id}}
+        auto_assign_nic: true
         detailed: true
       runner:
         concurrency: {{concurrency}}
         times: {{times}}
         type: "constant"
       context:
+        network:
+          start_cidr: "10.0.0.0/16"
+          networks_per_tenant: 1
         users:
           tenants: 1
           users_per_tenant: 1
diff --git a/rally/nova/nova-boot-show-cc.yml b/rally/nova/nova-boot-show-cc.yml
index 80deb83ac..2ddfa6e33 100644
--- a/rally/nova/nova-boot-show-cc.yml
+++ b/rally/nova/nova-boot-show-cc.yml
@@ -11,13 +11,15 @@
             name: "{{flavor_name}}"
         image:
             name: "{{image_name}}"
-        nics:
-            - net-id: {{net_id}}
+        auto_assign_nic: true
       runner:
         concurrency: {{concurrency}}
         times: {{times}}
         type: "constant"
       context:
+        network:
+          start_cidr: "10.0.0.0/16"
+          networks_per_tenant: 1
         users:
           tenants: 1
           users_per_tenant: 1
diff --git a/rally/nova/nova-boot-snapshot-cc.yml b/rally/nova/nova-boot-snapshot-cc.yml
index fd60c7d5b..2038e11be 100644
--- a/rally/nova/nova-boot-snapshot-cc.yml
+++ b/rally/nova/nova-boot-snapshot-cc.yml
@@ -12,14 +12,16 @@
         image:
             name: "{{image_name}}"
         force_delete: false
-        nics:
-            - net-id: {{net_id}}
+        auto_assign_nic: true
         detailed: true
       runner:
         concurrency: {{concurrency}}
         times: {{times}}
         type: "constant"
       context:
+        network:
+          start_cidr: "10.0.0.0/16"
+          networks_per_tenant: 1
         users:
           tenants: 1
           users_per_tenant: 1
diff --git a/rally/nova/nova-lock-unlock-cc.yml b/rally/nova/nova-lock-unlock-cc.yml
index e7e88fb77..d8de6a06d 100644
--- a/rally/nova/nova-lock-unlock-cc.yml
+++ b/rally/nova/nova-lock-unlock-cc.yml
@@ -11,13 +11,15 @@
             name: {{flavor_name}}
         image:
             name: {{image_name}}
-        nics:
-            - net-id: {{net_id}}
+        auto_assign_nic: true
       runner:
         concurrency: {{concurrency}}
         times: {{times}}
         type: "constant"
       context:
+        network:
+          start_cidr: "10.0.0.0/16"
+          networks_per_tenant: 1
         users:
           tenants: 1
           users_per_tenant: 1