diff --git a/modules/desktop-common.nix b/modules/desktop-common.nix
index fdc004d..73c8a25 100644
--- a/modules/desktop-common.nix
+++ b/modules/desktop-common.nix
@@ -17,7 +17,6 @@
       joplin-desktop
       qbittorrent
       kdePackages.kate
-      jellyfin-desktop
       flatpak
       grayjay
       vscode.fhs
diff --git a/modules/sys/rc/openssh.nix b/modules/sys/rc/openssh.nix
index 180c3fa..4b50ea0 100644
--- a/modules/sys/rc/openssh.nix
+++ b/modules/sys/rc/openssh.nix
@@ -1,6 +1,10 @@
 {
+  programs.ssh = {
+    startAgent = true;
+    agentPKCS11Whitelist = "${config.security.tpm2.pkcs11.package}/lib/*,/run/current-system/sw/lib/*";
+  };
   services.openssh = {
     enable = true;
     settings.PasswordAuthentication = true;
   };
-}
\ No newline at end of file
+}
diff --git a/modules/sys/security.nix b/modules/sys/security.nix
index 466714c..602ed9b 100644
--- a/modules/sys/security.nix
+++ b/modules/sys/security.nix
@@ -3,6 +3,11 @@
     sudo.execWheelOnly = true;
     polkit.enable = true;
     protectKernelImage = true;
+    tpm = {
+      enable = true;
+      pkcs11.enable = true;
+      tctiEnvironment.enable = true;
+    };
   };
   system.autoUpgrade = {
     enable = true;
diff --git a/modules/sys/users/juliet.nix b/modules/sys/users/juliet.nix
index 6446443..c3a2f90 100644
--- a/modules/sys/users/juliet.nix
+++ b/modules/sys/users/juliet.nix
@@ -2,8 +2,8 @@
   users.users.juliet = {
     description = "Juliet";
     isNormalUser = true;
-    extraGroups = [ "audio" "video" "bluetooth" "wheel" "input" "networkmanager" "scanner" "lp" ];
+    extraGroups = [ "audio" "video" "bluetooth" "wheel" "input" "networkmanager" "scanner" "lp" "tss" ];
     initialPassword = "password";
     linger = true;
   };
-}
\ No newline at end of file
+}
diff --git a/modules/sys/users/k3t.nix b/modules/sys/users/k3t.nix
index cee0a67..8581683 100644
--- a/modules/sys/users/k3t.nix
+++ b/modules/sys/users/k3t.nix
@@ -2,11 +2,12 @@
   users.users.k3t = {
     description = "Kai Moore";
     isNormalUser = true;
-    extraGroups = [ "audio" "video" "bluetooth" "wheel" "input" "networkmanager" "scanner" "lp" ];
+    extraGroups = [ "audio" "video" "bluetooth" "wheel" "input" "networkmanager" "scanner" "lp" "tss" ];
     initialPassword = "password";
     linger = true;
     openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG6evv6KcTvFDp4EeO9mMAa2Pb7yYZ/uTNM6TrVt5nKc k3t@DESKTOP-GTFSBKP" # TBB Win10
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG6evv6KcTvFDp4EeO9mMAa2Pb7yYZ/uTNM6TrVt5nKc k3t@TheBlackBox" # TBB
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1DAk3isgJPJbo19Kto6EnZdDMIe6F6D/BLyhhQPmBd k3t@T14" # T14
     ];
   };
-}
\ No newline at end of file
+}