diff --git a/.gitignore b/.gitignore
index 397b4a7..20fe186 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.log
+*.retry
diff --git a/README.md b/README.md
index 2715fe9..039812a 100644
--- a/README.md
+++ b/README.md
@@ -8,13 +8,13 @@
 ## Usage
 
 ```bash
-$ ansible-playbook playbook.yml
+$ ansible-playbook main.yml
 ```
 
 Run everything.
 
 ```bash
-$ ansible-playbook playbook.yml -t <tag>
+$ ansible-playbook main.yml -t <tag>
 ```
 
 Run a specific tag.
diff --git a/ansible.cfg b/ansible.cfg
index 5f1eb5c..9a014d1 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,5 +1,2 @@
 [defaults]
-log_path = ./log/ansible.log
-hostfile = ./inventory
-inventory = ./inventory
-roles_path = ./.roles
+roles_path = ./.roles:/etc/ansible/roles
diff --git a/inventory b/inventory
index 8a9c63a..0dd74f1 100644
--- a/inventory
+++ b/inventory
@@ -1,2 +1,2 @@
-[local]
-127.0.0.1 ansible_connection=local
+[localhost]
+127.0.0.1
diff --git a/log/.gitkeep b/log/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/main.yml b/main.yml
new file mode 100644
index 0000000..edcbefd
--- /dev/null
+++ b/main.yml
@@ -0,0 +1,15 @@
+---
+- hosts: localhost
+  connection: local
+
+  vars_files:
+    - vars/dotfiles.yml
+    - vars/homebrew.yml
+    - vars/misc.yml
+
+  tasks:
+    - include: tasks/sudoers.yml
+
+  roles:
+    - geerlingguy.dotfiles
+    - geerlingguy.homebrew
diff --git a/playbook.yml b/playbook.yml
deleted file mode 100644
index b8b59d7..0000000
--- a/playbook.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- hosts: all
-
-  vars_files:
-    - vars/dotfiles.yml
-    - vars/homebrew.yml
-    - vars/misc.yml
-
-  tasks:
-    - { include: tasks/sudoers.yml, tags: ['base', 'sudoers'] }
-
-  roles:
-    - { role: geerlingguy.dotfiles, tags: ['dotfiles'] }
-    - { role: geerlingguy.homebrew, tags: ['brew', 'homebrew'] }
-    - { role: dotstrap.fish, tags: ['fish'] }
-    - { role: sublime, tags: ['sublime'] }
-    - { role: osx, tags: ['osx'] }
diff --git a/requirements.yml b/requirements.yml
index 5f688ba..bed20cd 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,10 +1,5 @@
 ---
-- src: geerlingguy.dotfiles
-  version: 1.1.0
-- src: geerlingguy.homebrew
-  version: 1.4.1
-- src: geerlingguy.nodejs
-  version: 3.2.0
-- src: geerlingguy.ruby
-  version: 2.3.1
-- src: dotstrap.fish
+- src: 'geerlingguy.dotfiles'
+  version: '1.1.0'
+- src: 'geerlingguy.homebrew'
+  version: '2.1.0'
diff --git a/vars/homebrew.yml b/vars/homebrew.yml
index ecd449d..14c7741 100644
--- a/vars/homebrew.yml
+++ b/vars/homebrew.yml
@@ -2,12 +2,18 @@
 homebrew_taps:
   - caskroom/cask
   - caskroom/fonts
+  - caskroom/versions
   - homebrew/dupes
   - homebrew/php
   - homebrew/services
 
 homebrew_installed_packages:
+  - cairo
   - composer
+  - direnv
+  - docker
+  - docker-compose
+  - docker-machine
   - drupal-code-sniffer
   - fish
   - git-extras
@@ -24,41 +30,43 @@ homebrew_installed_packages:
   - python
   - ssh-copy-id
   - tig
+  - tmux
   - watch
   - wget
 
 homebrew_cask_apps:
-  - alfred
   - appcleaner
-  - blue-jeans-launcher
+  - avast
+  # - blue-jeans-launcher
   - caffeine
   - cyberduck
-  - dockertoolbox
   - dropbox
   - filezilla
-  - fing
+  # - fing
   - firefox
   - flux
-  - font-hack
+  - font-fira-code
   - gitx
   - google-chrome
   - google-drive
   - gpgtools
   - iterm2
   - joinme
-  - keepassx
+  - keybase
   - lastpass
   - licecap
   - moom
+  - ngrok
   - opera
   - phpstorm
+  - postman
   - seil
   - sequel-pro
   - skype
   - slack
   - sourcetree
   - spotify
-  - sublime-text
+  - sublime-text-dev
   - teamviewer
   - textual
   - textwrangler