diff --git a/elements/vm/common-deps.bst b/elements/vm/common-deps.bst
index 6bc38936869738a86785040a12618b951cba4a4c..93c968dacee7f61612bcd40646dc6d0bcb52bb40 100644
--- a/elements/vm/common-deps.bst
+++ b/elements/vm/common-deps.bst
@@ -11,6 +11,7 @@ depends:
 - vm/flathub-config.bst
 - vm/gnome-nightly-config.bst
 - vm/ostree-config.bst
+- vm/console-shell-override.bst
 - vm/plymouth-gnome-theme.bst
 - vm/resize-root.bst
 - vm/spice-vdagent.bst
diff --git a/elements/vm/console-shell-override.bst b/elements/vm/console-shell-override.bst
new file mode 100644
index 0000000000000000000000000000000000000000..aff1b60b36662dd7db27e7e9386fe31dcd74aad6
--- /dev/null
+++ b/elements/vm/console-shell-override.bst
@@ -0,0 +1,8 @@
+kind: import
+
+sources:
+- kind: local
+  path: files/gnome-console/99-fish-override.gschema.override
+
+config:
+  target: '%{datadir}/glib-2.0/schemas/'
diff --git a/elements/vm/fish.bst b/elements/vm/fish.bst
index 16a9413e2280dabe5e964380c9af2be4db67888b..ae711e93e968dfb7da29c2fc023e69980fd28e67 100644
--- a/elements/vm/fish.bst
+++ b/elements/vm/fish.bst
@@ -2,7 +2,7 @@ kind: cmake
 
 sources:
 - kind: tar
-  url: github_files:fish-shell/fish-shell/releases/download/3.3.1/fish-3.3.1.tar.xz
+  url: github_files:fish-shell/fish-shell/releases/download/3.5.0/fish-3.5.0.tar.xz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
diff --git a/files/gnome-console/99-fish-override.gschema.override b/files/gnome-console/99-fish-override.gschema.override
new file mode 100644
index 0000000000000000000000000000000000000000..e8490f39130e2b044cff62e841b94431876570f3
--- /dev/null
+++ b/files/gnome-console/99-fish-override.gschema.override
@@ -0,0 +1,2 @@
+[org.gnome.Console]
+shell=['fish']