diff --git a/playbook.yml b/playbook.yml
index 52b867a..fca62b7 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -10,7 +10,5 @@
   roles:
     - { role: geerlingguy.dotfiles, tags: ['dotfiles'] }
     - { role: geerlingguy.homebrew, tags: ['brew'] }
+    - { role: dotstrap.fish, tags: ['fish'] }
     - { role: sublime, tags: ['sublime'] }
-
-  post_tasks:
-    - { include: tasks/fish.yml, tags: ['base'] }
diff --git a/requirements.yml b/requirements.yml
index 6bc061f..992d75a 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -4,3 +4,4 @@
 - src: geerlingguy.nodejs
 - src: geerlingguy.ruby
 - src: opdavies.sculpin
+- src: dotstrap.fish