diff --git a/ansible/install/roles/browbeat/tasks/main.yml b/ansible/install/roles/browbeat/tasks/main.yml
index bfec82cdb..f1cf94a9c 100644
--- a/ansible/install/roles/browbeat/tasks/main.yml
+++ b/ansible/install/roles/browbeat/tasks/main.yml
@@ -90,7 +90,7 @@
      virtualenv={{ perfkit_venv }}
 
 - name: Install rally into rally-venv
-  pip: name=rally virtualenv={{ rally_venv }}
+  pip: name=rally version=0.5.0 virtualenv={{ rally_venv }}
 
 - name: Setup rally database
   shell: . {{ rally_venv }}/bin/activate; rally-manage db recreate
diff --git a/rally/rally-plugins/netcreate-boot-ping/netcreate_nova-boot-fip-ping.py b/rally/rally-plugins/netcreate-boot-ping/netcreate_nova-boot-fip-ping.py
index 130031592..765ea2675 100644
--- a/rally/rally-plugins/netcreate-boot-ping/netcreate_nova-boot-fip-ping.py
+++ b/rally/rally-plugins/netcreate-boot-ping/netcreate_nova-boot-fip-ping.py
@@ -31,8 +31,8 @@ class NeutronBootFipPingPlugin(neutron_utils.NeutronScenario,
     # Cleanup
     #
 
-    @types.set(image=types.ImageResourceType,
-               flavor=types.FlavorResourceType)
+    @types.convert(image={"type": "glance_image"},
+                   flavor={"type": "nova_flavor"})
     @validation.image_valid_on_flavor("flavor", "image")
     @validation.required_openstack(users=True)
     @scenario.configure(context={"cleanup": ["nova", "neutron"],
diff --git a/rally/rally-plugins/netcreate-boot/netcreate_boot.py b/rally/rally-plugins/netcreate-boot/netcreate_boot.py
index 46ed01de2..59fb89ea8 100644
--- a/rally/rally-plugins/netcreate-boot/netcreate_boot.py
+++ b/rally/rally-plugins/netcreate-boot/netcreate_boot.py
@@ -21,8 +21,8 @@ class BrowbeatPlugin(neutron_utils.NeutronScenario,
                      nova_utils.NovaScenario,
                      scenario.Scenario):
 
-    @types.set(image=types.ImageResourceType,
-               flavor=types.FlavorResourceType)
+    @types.convert(image={"type": "glance_image"},
+                   flavor={"type": "nova_flavor"})
     @validation.image_valid_on_flavor("flavor", "image")
     @validation.required_openstack(users=True)
     @scenario.configure(context={"cleanup": ["nova", "neutron"]})
diff --git a/rally/rally-plugins/subnet-router-create/subnet-router-create.py b/rally/rally-plugins/subnet-router-create/subnet-router-create.py
index 31d1b7c11..661ec6ab0 100644
--- a/rally/rally-plugins/subnet-router-create/subnet-router-create.py
+++ b/rally/rally-plugins/subnet-router-create/subnet-router-create.py
@@ -17,8 +17,9 @@ from rally.task import validation
 
 class NeutronPlugin(neutron_utils.NeutronScenario,
                     scenario.Scenario):
-    @types.set(image=types.ImageResourceType,
-               flavor=types.FlavorResourceType)
+
+    @types.convert(image={"type": "glance_image"},
+                   flavor={"type": "nova_flavor"})
     @validation.required_openstack(users=True)
     @scenario.configure(context={"cleanup": ["neutron"]})
     def create_router_and_net(self,num_networks=1,network_create_args=None,