diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 7248ce50da..94eaa73e0d 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -78,8 +78,7 @@
       Development via Vagrant: `vagrant destroy && vagrant up`
 
       Staging/Production: Create a new server with Ubuntu 16.04 and provision
-  when: ansible_distribution_release == 'trusty'
-  run_once: true
+  when: ansible_distribution_release != 'xenial'
 
 - name: Check whether passlib is needed
   fail: