diff --git a/config/base.toml b/config/base.toml
index 15bb0176..786c0013 100644
--- a/config/base.toml
+++ b/config/base.toml
@@ -276,12 +276,12 @@ uid = 0
 gid = 0
 name = "root"
 home = "/root"
-shell = "/usr/bin/ion"
+shell = "/usr/bin/bash"
 
 [users.user]
 # Password is unset
 password = ""
-shell = "/usr/bin/ion"
+shell = "/usr/bin/bash"
 
 # Group settings
 [groups.sudo]
diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml
index 559df360..b21712a9 100644
--- a/config/x86_64/ci.toml
+++ b/config/x86_64/ci.toml
@@ -58,6 +58,7 @@ expat = {}
 extrautils = {}
 ffmpeg6 = {}
 findutils = {}
+fish-shell = {}
 fontconfig = {}
 freedoom = {}
 freefont = {}
@@ -213,6 +214,7 @@ winit-wayland = {}
 xxhash = {}
 xz = {}
 zenity = {}
+zsh = {}
 zlib = {}
 zstd = {}
 
diff --git a/recipes/wip/shells/fish-shell/recipe.toml b/recipes/wip/shells/fish-shell/recipe.toml
index 4ef60fe7..1327a051 100644
--- a/recipes/wip/shells/fish-shell/recipe.toml
+++ b/recipes/wip/shells/fish-shell/recipe.toml
@@ -1,5 +1,4 @@
-# WIP: Builds, runs, but hangs on waitpid
-
+#TODO: Install share/completion files
 [source]
 git = "https://github.com/fish-shell/fish-shell"
 rev = "54e8ad7e90a8213c01ba58de0640223bee6846d6"
diff --git a/recipes/wip/shells/zsh/recipe.toml b/recipes/wip/shells/zsh/recipe.toml
index 572f979a..f8a67cd5 100644
--- a/recipes/wip/shells/zsh/recipe.toml
+++ b/recipes/wip/shells/zsh/recipe.toml
@@ -1,4 +1,4 @@
-#TODO: Buggy, can't return after running commands
+#TODO: spammy getrusage() warning, or need times() support
 [source]
 tar = "https://github.com/zsh-users/zsh/archive/refs/tags/zsh-5.9.tar.gz"
 blake3 = "a15b94fae03e87aba6fc6a27df3c98e610b85b0c7c0fc90248f07fdcb8816860"