diff --git a/arch/workstation.yml b/arch/workstation.yml
index 512d2f8..d8f7a66 100644
--- a/arch/workstation.yml
+++ b/arch/workstation.yml
@@ -1,10 +1,24 @@
 - hosts: localhost
   connection: local
   roles:
-    - base
-    - dotfiles
-    - toolbox
-    - password_store
-    - emacs
-    - gui
-    - stumpwm
+    - role: base
+      tags:
+        - base
+    - role: dotfiles
+      tags:
+        - dotfiles
+    - role: toolbox
+      tags:
+        - toolbox
+    - role: password_store
+      tags:
+        - password_store
+    - role: emacs
+      tags:
+        - emacs
+    - role: gui
+      tags:
+        - gui
+    - role: stumpwm
+      tags:
+        - stumpwm