diff --git a/roles/core/userland-software/init.sls b/roles/core/userland-software/init.sls
--- a/roles/core/userland-software/init.sls
+++ b/roles/core/userland-software/init.sls
@@ -17,7 +17,6 @@
     - installed
     - pkgs:
       - bash
-      - fish
       - zsh
       {% if grains['os'] != 'FreeBSD' %}
       - tcsh
diff --git a/roles/shellserver/userland-software/base.sls b/roles/shellserver/userland-software/base.sls
--- a/roles/shellserver/userland-software/base.sls
+++ b/roles/shellserver/userland-software/base.sls
@@ -70,6 +70,16 @@
       - lynx
 
 #   -------------------------------------------------------------
+#   More exotic shells
+#   -------------------------------------------------------------
+
+userland_software_shells:
+  pkg:
+    - installed
+    - pkgs:
+      - fish
+
+#   -------------------------------------------------------------
 #   Development
 #   -------------------------------------------------------------