diff --git a/modules/autostart.nix b/modules/autostart.nix
index cde4419..4cb3147 100644
--- a/modules/autostart.nix
+++ b/modules/autostart.nix
@@ -4,9 +4,14 @@
   #   Temporary workaround until https://github.com/nix-community/home-manager/issues/3447 is merged.
 
   home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
-    home.file."keepassxc" = {
-      target = ".config/autostart/org.keepassxc.KeePassXC.desktop";
-      source = (pkgs.keepassxc + "/share/applications/org.keepassxc.KeePassXC.desktop");
+#    home.file."keepassxc" = {
+#      target = ".config/autostart/org.keepassxc.KeePassXC.desktop";
+#      source = (pkgs.keepassxc + "/share/applications/org.keepassxc.KeePassXC.desktop");
+#    };
+
+    home.file."gnome-secrets" = {
+      target = ".config/autostart/org.gnome.World.Secrets.desktop";
+      source = (pkgs.gnome-secrets + "/share/applications/org.gnome.World.Secrets.desktop");
     };
 
     home.file."signal-desktop" = lib.mkIf (osConfig.networking.hostName == "yodaTux") {
diff --git a/modules/programs.nix b/modules/programs.nix
index 5a912a1..6613954 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -33,7 +33,8 @@
       # Graphical apps
 
       tor-browser-bundle-bin # Tor web browser
-      keepassxc # Password manager
+      gnome-secrets # Password manager (Native Wayland client)
+      #keepassxc # Password manager
       freetube # YouTube client
       tartube-yt-dlp # Video downloader (front-end for yt-dlp)
       joplin-desktop # Markdown notes