diff --git a/.ansible-lint b/.ansible-lint
new file mode 100644
index 0000000..539d333
--- /dev/null
+++ b/.ansible-lint
@@ -0,0 +1,3 @@
+---
+skip_list:
+  - experimental
diff --git a/main.yml b/main.yml
index 8cfc56f..b35b077 100644
--- a/main.yml
+++ b/main.yml
@@ -5,7 +5,8 @@
     - default.config.yml
 
   pre_tasks:
-    - include_vars: "{{ item }}"
+    - name: Include playbook configuration.
+      include_vars: "{{ item }}"
       with_fileglob:
         - "{{ playbook_dir }}/config.yml"
       tags: ['always']
diff --git a/requirements.yml b/requirements.yml
index a64b149..859e695 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,4 +1,5 @@
 ---
-- name: geerlingguy.dotfiles
-- name: geerlingguy.homebrew
-- name: geerlingguy.mas
+roles:
+  - name: geerlingguy.dotfiles
+  - name: geerlingguy.homebrew
+  - name: geerlingguy.mas
diff --git a/tasks/osx.yml b/tasks/osx.yml
index b952d90..ec12cd5 100644
--- a/tasks/osx.yml
+++ b/tasks/osx.yml
@@ -1,5 +1,5 @@
 ---
 # TODO: Use sudo once .osx can be run via root with no user interaction.
 - name: Run .osx dotfiles.
-  shell: "{{ osx_script }}"
+  command: "{{ osx_script }}"
   changed_when: false
diff --git a/tasks/terminal.yml b/tasks/terminal.yml
index 618faf6..3807ab6 100644
--- a/tasks/terminal.yml
+++ b/tasks/terminal.yml
@@ -1,19 +1,19 @@
 ---
 # Custom Terminal theme.
 - name: Get current Terminal profile.
-  shell: defaults read com.apple.terminal 'Default Window Settings'
+  command: defaults read com.apple.terminal 'Default Window Settings'
   register: terminal_theme
   changed_when: false
   check_mode: false
 
 - name: Ensure custom Terminal profile is added.
-  shell: open files/terminal/JJG-Term.terminal
+  command: open files/terminal/JJG-Term.terminal
   changed_when: false
   when: "'JJG-Term' not in terminal_theme.stdout"
 
 # TODO: This doesn't work in Yosemite. Consider a different solution?
 - name: Ensure custom Terminal profile is set as default.
-  shell: "{{ item }}"
+  command: "{{ item }}"
   with_items:
     - defaults write com.apple.terminal 'Default Window Settings' -string JJG-Term
     - defaults write com.apple.terminal 'Startup Window Settings' -string JJG-Term