diff --git a/provision.yml b/provision.yml
index ded31a8..3dd880b 100755
--- a/provision.yml
+++ b/provision.yml
@@ -1,9 +1,10 @@
 #!/usr/bin/env ansible-playbook
 # vim:ft=ansible:
 ---
-- hosts: tag_role_common
+- hosts: ec2
   roles:
     - common
 - hosts: tag_role_ansiblehost
   roles:
+    - user
     - ansiblehost
diff --git a/roles/ansiblehost/tasks/main.yml b/roles/ansiblehost/tasks/main.yml
index 93657bd..f509df9 100644
--- a/roles/ansiblehost/tasks/main.yml
+++ b/roles/ansiblehost/tasks/main.yml
@@ -1,9 +1,6 @@
 #!/usr/bin/ansible-playbook
 # vim:ft=ansible:
 ---
-- name: Basic setup
-  include_role:
-    name: common
 - name: Install Ansible-required packages via apt
   apt:
     name: "{{ packages }}"
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index b4b6dac..8a1ab01 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -15,6 +15,3 @@
     packages:
     - vim
   become: true
-- name: Set up users
-  include_role:
-    name: user