diff --git a/PKGBUILD b/PKGBUILD
index 8db5646..cc1ad0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=(
   luzifer-gui
   luzifer-lenovo-gui
 )
-pkgver=0.11.1
+pkgver=0.12.0
 pkgrel=1
 pkgdesc='System configuration for @luzifer systems'
 arch=(any)
@@ -75,6 +75,7 @@ package_luzifer-base() {
   depends+=(
     apparmor
     audit
+    clamav
   )
 
   # Add custom sytem utils
diff --git a/base/usr/share/luzifer/base-setup/ansible.cfg b/base/usr/share/luzifer/base-setup/ansible.cfg
new file mode 100644
index 0000000..fadf537
--- /dev/null
+++ b/base/usr/share/luzifer/base-setup/ansible.cfg
@@ -0,0 +1,2 @@
+[defaults]
+roles_path = roles
diff --git a/base/usr/share/luzifer/base-setup/playbook.yaml b/base/usr/share/luzifer/base-setup/playbook.yaml
index f4860fb..d1ad749 100644
--- a/base/usr/share/luzifer/base-setup/playbook.yaml
+++ b/base/usr/share/luzifer/base-setup/playbook.yaml
@@ -1,9 +1,9 @@
 ---
 
 - hosts: all
-  tasks:
-    - include_tasks: tasks/systemtime.yaml
-    - include_tasks: tasks/locale.yaml
-    - include_tasks: tasks/security.yaml
+  roles:
+    - { role: locale }
+    - { role: security }
+    - { role: systemtime }
 
 ...
diff --git a/base/usr/share/luzifer/base-setup/files/locale.gen b/base/usr/share/luzifer/base-setup/roles/locale/files/locale.gen
similarity index 100%
rename from base/usr/share/luzifer/base-setup/files/locale.gen
rename to base/usr/share/luzifer/base-setup/roles/locale/files/locale.gen
diff --git a/base/usr/share/luzifer/base-setup/tasks/locale.yaml b/base/usr/share/luzifer/base-setup/roles/locale/tasks/main.yaml
similarity index 100%
rename from base/usr/share/luzifer/base-setup/tasks/locale.yaml
rename to base/usr/share/luzifer/base-setup/roles/locale/tasks/main.yaml
diff --git a/base/usr/share/luzifer/base-setup/files/audit.rules b/base/usr/share/luzifer/base-setup/roles/security/files/audit.rules
similarity index 100%
rename from base/usr/share/luzifer/base-setup/files/audit.rules
rename to base/usr/share/luzifer/base-setup/roles/security/files/audit.rules
diff --git a/base/usr/share/luzifer/base-setup/files/limits.conf b/base/usr/share/luzifer/base-setup/roles/security/files/limits.conf
similarity index 100%
rename from base/usr/share/luzifer/base-setup/files/limits.conf
rename to base/usr/share/luzifer/base-setup/roles/security/files/limits.conf
diff --git a/base/usr/share/luzifer/base-setup/files/sysctl.conf b/base/usr/share/luzifer/base-setup/roles/security/files/sysctl.conf
similarity index 100%
rename from base/usr/share/luzifer/base-setup/files/sysctl.conf
rename to base/usr/share/luzifer/base-setup/roles/security/files/sysctl.conf
diff --git a/base/usr/share/luzifer/base-setup/files/tmpfiles.conf b/base/usr/share/luzifer/base-setup/roles/security/files/tmpfiles.conf
similarity index 100%
rename from base/usr/share/luzifer/base-setup/files/tmpfiles.conf
rename to base/usr/share/luzifer/base-setup/roles/security/files/tmpfiles.conf
diff --git a/base/usr/share/luzifer/base-setup/tasks/security.yaml b/base/usr/share/luzifer/base-setup/roles/security/tasks/main.yaml
similarity index 100%
rename from base/usr/share/luzifer/base-setup/tasks/security.yaml
rename to base/usr/share/luzifer/base-setup/roles/security/tasks/main.yaml
diff --git a/base/usr/share/luzifer/base-setup/files/timesyncd.conf b/base/usr/share/luzifer/base-setup/roles/systemtime/files/timesyncd.conf
similarity index 100%
rename from base/usr/share/luzifer/base-setup/files/timesyncd.conf
rename to base/usr/share/luzifer/base-setup/roles/systemtime/files/timesyncd.conf
diff --git a/base/usr/share/luzifer/base-setup/tasks/systemtime.yaml b/base/usr/share/luzifer/base-setup/roles/systemtime/tasks/main.yaml
similarity index 100%
rename from base/usr/share/luzifer/base-setup/tasks/systemtime.yaml
rename to base/usr/share/luzifer/base-setup/roles/systemtime/tasks/main.yaml