diff --git a/playbook.yml b/playbook.yml
index 942a13c..01a88cd 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -4,7 +4,6 @@
   roles:
     - { role: base, tags: ['base'] }
     - { role: grub, tags: ['grub'], when: "bootloader == 'grub'"}
-    - { role: sudo, tags: ['sudo'] }
     - { role: gnupg, tags: ['gnupg'] }
     - { role: sysmon, tags: ['sysmon'] }
     - { role: cron, tags: ['cron'] }
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index be5cfa4..fba71a5 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -20,5 +20,6 @@
 
 - include_tasks: shell.yml
 - include_tasks: user.yml
+- include_tasks: sudo.yml
 - include_tasks: packages.yml
 - include_tasks: journal.yml
diff --git a/roles/sudo/tasks/main.yml b/roles/base/tasks/sudo.yml
similarity index 87%
rename from roles/sudo/tasks/main.yml
rename to roles/base/tasks/sudo.yml
index dbde537..c22b760 100644
--- a/roles/sudo/tasks/main.yml
+++ b/roles/base/tasks/sudo.yml
@@ -3,6 +3,8 @@
   pacman:
     name: sudo
     state: present
+  tags:
+    - sudo
 
 - name: Add user to wheel group
   user:
@@ -10,6 +12,7 @@
     groups: wheel
     append: yes
   tags:
+    - sudo
     - user
 
 - name: Copy sudo wheel group configuration
@@ -18,3 +21,5 @@
     dest: /etc/sudoers.d/01_wheel
     mode: 440
     validate: 'visudo -cf %s'
+  tags:
+    - sudo
diff --git a/roles/sudo/templates/sudo_wheel.j2 b/roles/base/templates/sudo_wheel.j2
similarity index 100%
rename from roles/sudo/templates/sudo_wheel.j2
rename to roles/base/templates/sudo_wheel.j2