diff --git a/modules/dev.nix b/modules/dev.nix
index c412c58..064aeb7 100644
--- a/modules/dev.nix
+++ b/modules/dev.nix
@@ -4,7 +4,10 @@ let
 in {
   den.aspects.dev.nixos = { pkgs, ... }:
   let
-    pkgs-unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
+    pkgs-unstable = import inputs.nixpkgs-unstable {
+      system = pkgs.system;
+      config.allowUnfree = true;
+    };
   in {
     environment.systemPackages = with pkgs-unstable; [
       # CLI utilities
@@ -15,6 +18,7 @@ in {
       ripgrep
       chafa
       forgejo-cli
+      awscli2
 
       tracy
 
@@ -22,7 +26,7 @@ in {
       docker-compose
 
       # IDE
-      jetbrains.idea-oss
+      jetbrains.idea
 
       # Neovim
       vimPlugins.blink-cmp
@@ -56,11 +60,27 @@ in {
       maven
     ];
 
-    programs.java = {
-      enable = true;
-      package = pkgs-unstable.openjdk17;
+    environment.variables = {
+      JAVA_HOME = "${pkgs-unstable.openjdk8}";
     };
 
+    systemd.tmpfiles.rules = [
+      "d /var/lib/payara41 0755 ${username} users -"
+    ];
+
+    system.activationScripts.payaraJava = ''
+      asenv=/var/lib/payara41/glassfish/config/asenv.conf
+      if [ -f "$asenv" ]; then
+        ${pkgs.gnused}/bin/sed -i '/^AS_JAVA=/d' "$asenv"
+        echo 'AS_JAVA="${pkgs-unstable.openjdk8}"' >> "$asenv"
+      fi
+
+      domain_xml=/var/lib/payara41/glassfish/domains/domain1/config/domain.xml
+      if [ -f "$domain_xml" ]; then
+        ${pkgs.gnused}/bin/sed -i 's|java-home="[^"]*"|java-home="${pkgs-unstable.openjdk8}/lib/openjdk"|' "$domain_xml"
+      fi
+    '';
+
     virtualisation.docker.enable = true;
     users.users.${username}.extraGroups = [ "docker" ];
   };