diff --git a/.github/docker/build-and-publish-docker-image.sh b/.github/docker/build-and-publish-docker-image.sh
index 6dbdb0f..01c6839 100755
--- a/.github/docker/build-and-publish-docker-image.sh
+++ b/.github/docker/build-and-publish-docker-image.sh
@@ -17,7 +17,7 @@ elif [[ "$1" != "" ]]; then
 fi
 
 UBUNTU_VERSION=jammy-20240125
-GHC_VERSIONS=( "9.10.1"  "9.8.4"  "9.6.6"  "9.4.8"  "9.2.8"   "9.0.2")
+GHC_VERSIONS=( "9.10.1"  "9.8.4"  "9.6.6"  "9.4.7"  "9.0.2")
 CABAL_VERSION="3.12.1.0"
 
 for i in "${!GHC_VERSIONS[@]}"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7d27941..0aa01a9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -124,12 +124,11 @@ jobs:
       matrix:
         ghc:
           - "9.0.2"
-          - "9.2.8"
-          - "9.4.8"
+          - "9.4.7"
           - "9.6.6"
 
     container:
-      image: ghcr.io/clash-lang/clash-vexriscv-ci:${{ matrix.ghc }}-20241214
+      image: ghcr.io/clash-lang/clash-vexriscv-ci:${{ matrix.ghc }}-20250110
 
     steps:
       - name: Checkout
diff --git a/shell.nix b/shell.nix
index f568c05..1473203 100644
--- a/shell.nix
+++ b/shell.nix
@@ -15,10 +15,12 @@ pkgs.mkShell {
 
       # Haskell toolchain
       pkgs.cabal-install
-      # pkgs.haskell.compiler.ghc90
-      # pkgs.haskell.compiler.ghc92
-      pkgs.haskell.compiler.ghc94
-      # pkgs.haskell.compiler.ghc96
+
+      pkgs.haskell.compiler.ghc90
+
+      # Clash throws a slow start warning / error on 9.4.8, so we use 9.4.7
+      pkgs.haskell.compiler.ghc947
+      pkgs.haskell.compiler.ghc96
 
       (pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml)
 
@@ -50,5 +52,9 @@ pkgs.mkShell {
 
     # Mixing Nix Cabal and non-Nix Cabal yields some weird linking errors.
     export CABAL_DIR="$HOME/.cabal-nix";
+
+
+    # Add nix bin executables to PATH
+    export PATH="$(git rev-parse --show-toplevel)/nix/bin:$PATH";
   '';
 }