diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..1b6ffa3
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,5 @@
+all:
+	ansible-playbook playbooks/all.yml
+	
+%:
+	ansible-playbook --extra-vars "enable_roles=['$@']" playbooks/all.yml
diff --git a/inventory/host_vars/self.yml b/inventory/host_vars/self.yml
index f11b2ac..d472c94 100644
--- a/inventory/host_vars/self.yml
+++ b/inventory/host_vars/self.yml
@@ -4,3 +4,15 @@ full_name: "{{ first_name }} {{ last_name }}"
 email: pim@kunis.nl
 vscodium_extensions:
   - shd101wyy.markdown-preview-enhanced
+enable_roles:
+  - bash
+  - alacritty
+  - wireguard
+  - asdf
+  - neovim
+  - signal
+  - virtualbox
+  - vscodium
+  - syncthing
+  - strawberry
+  - nicotine
diff --git a/playbooks/alacritty.yml b/playbooks/alacritty.yml
deleted file mode 100644
index 6f1f0b1..0000000
--- a/playbooks/alacritty.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install alacritty
-  hosts: self
-  roles:
-    - alacritty
diff --git a/playbooks/all.yml b/playbooks/all.yml
index 872cbe8..d05cabd 100644
--- a/playbooks/all.yml
+++ b/playbooks/all.yml
@@ -2,21 +2,8 @@
   hosts: self
   roles:
     - system
-  vars:
-    my_roles:
-      - bash
-      - alacritty
-      - wireguard
-      - asdf
-      - neovim
-      - signal
-      - virtualbox
-      - vscodium
-      - syncthing
-      - strawberry
-      - nicotine
   tasks:
     - include_tasks: "../library/rescue_role.yml"
-      loop: "{{ my_roles }}"
+      loop: "{{ enable_roles }}"
       loop_control:
         loop_var: item_my_role
diff --git a/playbooks/asdf.yml b/playbooks/asdf.yml
deleted file mode 100644
index 04d8e28..0000000
--- a/playbooks/asdf.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install asdf
-  hosts: self
-  roles:
-    - asdf
diff --git a/playbooks/bash.yml b/playbooks/bash.yml
deleted file mode 100644
index aeae6d0..0000000
--- a/playbooks/bash.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install bash
-  hosts: self
-  roles:
-    - bash
diff --git a/playbooks/neovim.yml b/playbooks/neovim.yml
deleted file mode 100644
index dc44cf4..0000000
--- a/playbooks/neovim.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install neovim
-  hosts: self
-  roles:
-    - neovim
diff --git a/playbooks/nicotine.yml b/playbooks/nicotine.yml
deleted file mode 100644
index 116c3ab..0000000
--- a/playbooks/nicotine.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install nicotine+
-  hosts: self
-  roles:
-    - nicotine
diff --git a/playbooks/signal.yml b/playbooks/signal.yml
deleted file mode 100644
index 2cb2a8b..0000000
--- a/playbooks/signal.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install Signal
-  hosts: self
-  roles:
-    - signal
diff --git a/playbooks/strawberry.yml b/playbooks/strawberry.yml
deleted file mode 100644
index 9b58390..0000000
--- a/playbooks/strawberry.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install strawberry
-  hosts: self
-  roles:
-    - strawberry
diff --git a/playbooks/syncthing.yml b/playbooks/syncthing.yml
deleted file mode 100644
index 7f094a6..0000000
--- a/playbooks/syncthing.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install Syncthing
-  hosts: self
-  roles:
-    - syncthing
diff --git a/playbooks/system.yml b/playbooks/system.yml
deleted file mode 100644
index 4be021f..0000000
--- a/playbooks/system.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Configure system
-  hosts: self
-  roles:
-    - system
diff --git a/playbooks/virtualbox.yml b/playbooks/virtualbox.yml
deleted file mode 100644
index 00f01c9..0000000
--- a/playbooks/virtualbox.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install VirtualBox
-  hosts: self
-  roles:
-    - virtualbox
diff --git a/playbooks/vscodium.yml b/playbooks/vscodium.yml
deleted file mode 100644
index b829de3..0000000
--- a/playbooks/vscodium.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install VSCodium
-  hosts: self
-  roles:
-    - vscodium
diff --git a/playbooks/wireguard.yml b/playbooks/wireguard.yml
deleted file mode 100644
index 4a5222d..0000000
--- a/playbooks/wireguard.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install wireguard
-  hosts: self
-  roles:
-    - wireguard