diff --git a/configurations/host/flamaster/configuration.nix b/configurations/host/flamaster/configuration.nix
index 17c54e7..368721f 100644
--- a/configurations/host/flamaster/configuration.nix
+++ b/configurations/host/flamaster/configuration.nix
@@ -119,6 +119,7 @@
     packages = with pkgs; [
       kate
     ];
+    shell = pkgs.zsh;
   };
 
   # Allow unfree packages
diff --git a/configurations/host/flamaster/home/materus/default.nix b/configurations/host/flamaster/home/materus/default.nix
index 5172de2..b3055a3 100644
--- a/configurations/host/flamaster/home/materus/default.nix
+++ b/configurations/host/flamaster/home/materus/default.nix
@@ -11,6 +11,8 @@
     enableTerminalExtra = lib.mkDefault true;
     enableNixDevel = lib.mkDefault true;
 
+    zsh.enable = true;
+
   };
 
   home.packages = [
diff --git a/configurations/host/valkyrie/default.nix b/configurations/host/valkyrie/default.nix
index 0642e05..85f2262 100644
--- a/configurations/host/valkyrie/default.nix
+++ b/configurations/host/valkyrie/default.nix
@@ -73,6 +73,7 @@
     packages = [
     ];
     openssh.authorizedKeys.keyFiles = [ ("${materusArg.cfg.path}" + "/extraFiles/keys/ssh/materus.pub") ];
+    shell = pkgs.zsh;
   };
   users.users.acme.openssh.authorizedKeys.keyFiles = [ ("${materusArg.cfg.path}" + "/extraFiles/keys/ssh/waffentrager.pub") ];
   users.users.acme.shell = pkgs.scponly;
@@ -99,7 +100,7 @@
   services.openssh.enable = true;
   services.openssh.openFirewall = false;
   services.openssh.settings.PermitRootLogin = "no";
-  services.openssh.settings.PasswordAuthentication = true;
+  services.openssh.settings.PasswordAuthentication = false;
 
 
 
diff --git a/configurations/host/valkyrie/home/materus/default.nix b/configurations/host/valkyrie/home/materus/default.nix
index 5d09242..a0cd593 100644
--- a/configurations/host/valkyrie/home/materus/default.nix
+++ b/configurations/host/valkyrie/home/materus/default.nix
@@ -12,5 +12,6 @@
 
     fish.enable = false;
     bash.enable = true;
+    zsh.enable = true;
   };
 }
diff --git a/configurations/host/waffentrager/configuration.nix b/configurations/host/waffentrager/configuration.nix
index c106e7f..547851a 100644
--- a/configurations/host/waffentrager/configuration.nix
+++ b/configurations/host/waffentrager/configuration.nix
@@ -42,6 +42,7 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPEDY+H8Hc/RSLE064AAh8IojvqxPd8BE5gec2aOfYMh materus@podkos.pl"
     ];
     hashedPasswordFile = config.sops.secrets."users/materus".path;
+    shell = pkgs.zsh;
   };
 
   nix = {
diff --git a/configurations/host/waffentrager/home/materus/default.nix b/configurations/host/waffentrager/home/materus/default.nix
index 8b32972..de02863 100644
--- a/configurations/host/waffentrager/home/materus/default.nix
+++ b/configurations/host/waffentrager/home/materus/default.nix
@@ -12,5 +12,6 @@
 
     fish.enable = false;
     bash.enable = true;
+    zsh.enable = true;
   };
 }