diff --git a/tasks/virt_instance_create.yml b/tasks/virt_instance_create.yml
index 387ef9785b..0e4c3e666f 100644
--- a/tasks/virt_instance_create.yml
+++ b/tasks/virt_instance_create.yml
@@ -38,7 +38,7 @@
 - name: ARMv7 copy the kernel out
   shell: "virt-builder --get-kernel {{ volgroup }}/{{ inventory_hostname }} --output /var/lib/libvirt/images/  | awk -F/ '{print $NF}' > /var/lib/libvirt/images/{{ inventory_hostname }}-details.txt"
   delegate_to: "{{ vmhost}}"
-  when: env != 'staging' and inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined )
+  when: inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined )
   tags:
     - armv7-kernel
 
@@ -46,7 +46,7 @@
   command: "head -n1 /var/lib/libvirt/images/{{ inventory_hostname }}-details.txt"
   delegate_to: "{{ vmhost}}"
   register: host_armv7kernel
-  when: env != 'staging' and inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined )
+  when: inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined )
   tags:
     - armv7-kernel
 
@@ -54,7 +54,7 @@
   command: "tail -n1 /var/lib/libvirt/images/{{ inventory_hostname }}-details.txt"
   delegate_to: "{{ vmhost}}"
   register: host_armv7initrd
-  when: env != 'staging' and inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined )
+  when: inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined )
   tags:
     - armv7-kernel
 
@@ -62,7 +62,7 @@
   shell: "virt-cat -a {{ volgroup }}/{{ inventory_hostname }} /boot/extlinux/extlinux.conf | grep -m1 append | sed -e 's/append //'"
   delegate_to: "{{ vmhost}}"
   register: host_cmdline
-  when: env != 'staging' and inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined )
+  when: inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined )
   tags:
     - armv7-kernel
 
@@ -71,13 +71,13 @@
     ansible_python_interpreter: /usr/bin/python3
   virt_boot: domain={{ inventory_hostname }} kernel=/var/lib/libvirt/images/{{ host_armv7kernel.stdout }} initrd=/var/lib/libvirt/images/{{ host_armv7initrd.stdout }} cmdline={{ host_cmdline.stdout }}
   delegate_to: "{{ vmhost }}"
-  when: env != 'staging' and inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined )
+  when: inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined )
   tags:
     - armv7-kernel
 
 - name: when armv7kernelupdate is set we are done
   fail: msg="armv7kernelupdate was set, so kernel has been updated and target booted up"
-  when: env != 'staging' and armv7kernelupdate is defined
+  when: armv7kernelupdate is defined
 
 - name: start the vm up and set it to autostart
   virt: state=running name={{ inventory_hostname }} autostart=True
@@ -86,7 +86,7 @@
 
 - name: ARMv7 pause while VM updates
   pause: seconds=5
-  when: env != 'staging' and inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined )
+  when: inventory_hostname.startswith(('buildvm-a32', 'buildvm-armv7','armv7-test')) and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined )
   tags:
     - armv7-kernel