diff --git a/base.ansible.yml b/base.ansible.yml
new file mode 100644
index 0000000..785b24a
--- /dev/null
+++ b/base.ansible.yml
@@ -0,0 +1,6 @@
+- name: Run Migrations
+  import_playbook: migrations.ansible.yml
+- name: Setup Directories
+  import_playbook: directories.ansible.yml
+- name: Setup System
+  import_playbook: system/init.ansible.yml
diff --git a/system/shell.ansible.yml b/system/shell.ansible.yml
index e762a54..5226adf 100644
--- a/system/shell.ansible.yml
+++ b/system/shell.ansible.yml
@@ -5,8 +5,7 @@
     - name: "system/shell : Install packages"
       package:
         name:
-          - zsh
-          - alpine-zsh-config
+          - fish
           - bash
         state: present
     - name: "system/shell : Populate shell profile"
diff --git a/system/user.ansible.yml b/system/user.ansible.yml
index 69cc8c8..5be9b55 100644
--- a/system/user.ansible.yml
+++ b/system/user.ansible.yml
@@ -12,4 +12,4 @@
     - name: "system/user : Edit root user"
       user:
         name: root
-        shell: /bin/zsh
+        shell: /usr/bin/fish
diff --git a/top.ansible.yml b/top.ansible.yml
index 8d77fdc..c204525 100644
--- a/top.ansible.yml
+++ b/top.ansible.yml
@@ -1,9 +1,5 @@
-- name: Run Migrations
-  import_playbook: migrations.ansible.yml
-- name: Setup Directories
-  import_playbook: directories.ansible.yml
-- name: Setup System
-  import_playbook: system/init.ansible.yml
+- name: Setup Base
+  import_playbook: base.ansible.yml
 - name: Setup Network
   import_playbook: network/init.ansible.yml
 - name: Setup Apps