diff --git a/main.yml b/main.yml
index 57648c7..d02eb5e 100644
--- a/main.yml
+++ b/main.yml
@@ -22,19 +22,22 @@
       tags: ['mas']
 
   tasks:
-    - include_tasks: tasks/ansible-setup.yml
+    - import_tasks: tasks/ansible-setup.yml
+      tags: ['setup']
 
-    - include_tasks: tasks/sudoers.yml
+    - import_tasks: tasks/sudoers.yml
       when: configure_sudoers
+      tags: ['sudoers']
 
-    - include_tasks: tasks/terminal.yml
+    - import_tasks: tasks/terminal.yml
       when: configure_terminal
+      tags: ['terminal']
 
-    - include_tasks: tasks/osx.yml
+    - import_tasks: tasks/osx.yml
       when: configure_osx
       tags: ['osx']
 
-    - include_tasks: tasks/extra-packages.yml
+    - import_tasks: tasks/extra-packages.yml
       tags: ['extra-packages']
     - name: Install global Ruby gems.
       gem:
@@ -46,7 +49,8 @@
       loop: "{{ gem_packages }}"
 
     - name: Run configured post-provision ansible task files.
-      include_tasks: "{{ outer_item }}"
+      import_tasks: "{{ outer_item }}"
       loop_control:
         loop_var: outer_item
       with_fileglob: "{{ post_provision_tasks|default(omit) }}"
+      tags: ['post']
diff --git a/tasks/extra-packages.yml b/tasks/extra-packages.yml
index 066fcb2..677148b 100644
--- a/tasks/extra-packages.yml
+++ b/tasks/extra-packages.yml
@@ -1,38 +1,34 @@
 ---
-- name: Ensure extra packages are installed
-  block:
-  - name: Install global Composer packages.
-    composer:
-      command: "{{ (item.state | default('present') == 'absent') | ternary('remove', 'require') }}"
-      arguments: "{{ item.name | default(item) }} {{ item.version | default('@stable') }}"
-      # Ansible 2.4 supports `global_command` making `working_dir` optional.
-      working_dir: "{{ lookup('env', 'COMPOSER_HOME') | default('~/.composer', true) }}"
-    loop: "{{ composer_packages }}"
+- name: Install global Composer packages.
+  composer:
+    command: "{{ (item.state | default('present') == 'absent') | ternary('remove', 'require') }}"
+    arguments: "{{ item.name | default(item) }} {{ item.version | default('@stable') }}"
+    # Ansible 2.4 supports `global_command` making `working_dir` optional.
+    working_dir: "{{ lookup('env', 'COMPOSER_HOME') | default('~/.composer', true) }}"
+  loop: "{{ composer_packages }}"
 
-  - name: Install global NPM packages.
-    ansible.builtin.npm:
-      name: "{{ item.name | default(item) }}"
-      state: "{{ item.state | default('present') }}"
-      version: "{{ item.version | default(omit) }}"
-      global: true
-      executable: "{{ item.executable | default(omit) }}"
-    loop: "{{ npm_packages }}"
+- name: Install global NPM packages.
+  npm:
+    name: "{{ item.name | default(item) }}"
+    state: "{{ item.state | default('present') }}"
+    version: "{{ item.version | default(omit) }}"
+    global: true
+    executable: "{{ item.executable | default(omit) }}"
+  loop: "{{ npm_packages }}"
 
-  - name: Install global Pip packages.
-    ansible.builtin.pip:
-      name: "{{ item.name | default(item) }}"
-      state: "{{ item.state | default('present') }}"
-      version: "{{ item.version | default(omit) }}"
-      executable: "{{ pip_executable | default(omit) }}"
-    loop: "{{ pip_packages }}"
+- name: Install global Pip packages.
+  pip:
+    name: "{{ item.name | default(item) }}"
+    state: "{{ item.state | default('present') }}"
+    version: "{{ item.version | default(omit) }}"
+    executable: "{{ item.executable | default(omit) }}"
+  loop: "{{ pip_packages }}"
 
-  - name: Install global Ruby gems.
-    ansible.builtin.gem:
-      name: "{{ item.name | default(item) }}"
-      state: "{{ item.state | default('present') }}"
-      version: "{{ item.version | default(omit) }}"
-      user_install: false
-      install_dir: "{{ gem_dir }}"
-      executable: "{{ gem_executable | default(omit) }}"
-    loop: "{{ gem_packages }}"
-  tags: ['extra-packages']
+- name: Install global Ruby gems.
+  gem:
+    name: "{{ item.name | default(item) }}"
+    state: "{{ item.state | default('present') }}"
+    version: "{{ item.version | default(omit) }}"
+    user_install: false
+    executable: "{{ item.executable | default(omit) }}"
+  loop: "{{ gem_packages }}"