diff --git a/home-manager/commands/commands.nix b/home-manager/commands/commands.nix
index abd33ac..8072bcb 100644
--- a/home-manager/commands/commands.nix
+++ b/home-manager/commands/commands.nix
@@ -129,11 +129,6 @@ in
   # Pentesting/security tools (eva-01 and eva-03)
   ++ lib.optionals (builtins.elem hostname [ "eva-01" "eva-03" ]) (with pkgs; [
     aircrack-ng
-    hcxdumptool
-    hcxtools
-    metasploit
-    wifite2
-    wirelesstools
     amass
     bettercap
     bloodhound
@@ -147,9 +142,12 @@ in
     hash-identifier
     hashcat
     hashcat-utils
+    hcxdumptool
+    hcxtools
     hping
     macchanger
     medusa
+    metasploit
     netdiscover
     netexec
     pwnat
@@ -160,6 +158,8 @@ in
     sqlmap
     steghide
     thc-hydra
+    wifite2
+    wirelesstools
   ])
 
   # eva-01 specific
@@ -169,7 +169,6 @@ in
     pkgs.parted
     pkgs.traceroute
     pkgs.android-tools
-    pkgs.goose-cli
   ]
 
   # eva-03 specific
diff --git a/hosts/eva-01/configuration.nix b/hosts/eva-01/configuration.nix
index e3349b7..1c9d538 100644
--- a/hosts/eva-01/configuration.nix
+++ b/hosts/eva-01/configuration.nix
@@ -141,8 +141,7 @@
   #Enable Ollama daemon
   services.ollama = {
     enable = true;
-    acceleration = "cuda";
-    package = pkgs-unstable.ollama-cuda;
+    package = pkgs-unstable.ollama;
   };
 
   #Enable Hyprland