diff --git a/ansible/laptop.yml b/ansible/laptop.yml
index 090f0248..e1a449c3 100644
--- a/ansible/laptop.yml
+++ b/ansible/laptop.yml
@@ -1,7 +1,8 @@
 tasks:
   - file: path={{ ansible_env.HOME }}/Applications state=directory
   # - homebrew: name=caskroom/cask/brew-cask state=upgraded
-  - command: brew install caskroom/cask/brew-cask
+  - homebrew-tap: name=caskroom/cask state=present
+  - homebrew: name=brew-cask state=present
   - homebrew_cask: name={{ item }} state=installed
     with_items:
       - slimbatterymonitor
diff --git a/ansible/roles/osx/tasks/casks.yml b/ansible/roles/osx/tasks/casks.yml
index e55f3b72..089916e1 100644
--- a/ansible/roles/osx/tasks/casks.yml
+++ b/ansible/roles/osx/tasks/casks.yml
@@ -2,7 +2,8 @@
 - include_vars: casks.yml
 - file: path={{ ansible_env.HOME }}/Applications state=directory
 # - homebrew: name=caskroom/cask/brew-cask state=upgraded
-- command: brew install caskroom/cask/brew-cask
+- homebrew-tap: name=caskroom/cask state=present
+- homebrew: name=brew-cask state=present
 - homebrew_cask: name={{ item }} state=installed
   with_items: casks
 - command: defaults write {{ item }}