diff --git a/main.yml b/main.yml
index f0b68f5..6133f8e 100644
--- a/main.yml
+++ b/main.yml
@@ -9,12 +9,16 @@
     - include_vars: "{{ item }}"
       with_fileglob:
         - ../config.yml
+      tags: ['always']
 
   roles:
-    - geerlingguy.homebrew
-    - geerlingguy.dotfiles
-    - name: geerlingguy.mas
+    - role: geerlingguy.homebrew
+      tags: ['homebrew']
+    - role: geerlingguy.dotfiles
+      tags: ['dotfiles']
+    - role: geerlingguy.mas
       when: mas_installed_apps
+      tags: ['mas']
 
   tasks:
     - include: tasks/ansible-setup.yml
@@ -27,3 +31,4 @@
 
     - include: tasks/osx.yml
       when: configure_osx
+      tags: ['osx']