diff --git a/playbook.yml b/playbook.yml
index 8adebb5..1b52788 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -15,3 +15,6 @@
     - { role: opdavies.sculpin, tags: ['sculpin'] }
     - { role: sublime, tags: ['sublime'] }
     - { role: mkdocs, tags: ['mkdocs'] }
+
+  post_tasks:
+    - { include: tasks/fish.yml, tags: ['base'] }
diff --git a/tasks/fish.yml b/tasks/fish.yml
new file mode 100644
index 0000000..626fb03
--- /dev/null
+++ b/tasks/fish.yml
@@ -0,0 +1,6 @@
+---
+- name: Set fish as the default shell.
+  become: yes
+  user:
+    name: opdavies
+    shell: /usr/local/bin/fish