diff --git a/hosts/pinwheel/modules/scala/default.nix b/hosts/pinwheel/modules/scala/default.nix
index 1504cf4..6d37db6 100644
--- a/hosts/pinwheel/modules/scala/default.nix
+++ b/hosts/pinwheel/modules/scala/default.nix
@@ -1,6 +1,8 @@
 { pkgs, lib, config, ... }:
 let
   enabled = config.mod.scala.enable;
+
+  globalJDKVersion = pkgs.jdk17;
 in
 {
   options = {
@@ -11,11 +13,15 @@ in
 
   config = lib.mkIf enabled {
     home-manager.users.alex = {
+      home.sessionVariables.JAVA_HOME = "${globalJDKVersion.home}";
+
       home.packages = [
+        globalJDKVersion
+
         pkgs.scala-cli
-        (pkgs.scala_2_13.override { jre = pkgs.jdk17; })
-        (pkgs.sbt.override { jre = pkgs.jdk17; })
-        (pkgs.metals.override { jre = pkgs.jdk17; })
+        (pkgs.scala_2_13.override { jre = globalJDKVersion; })
+        (pkgs.sbt.override { jre = globalJDKVersion; })
+        (pkgs.metals.override { jre = globalJDKVersion; })
       ];
     };
   };