diff --git a/home-manager/modules/default.nix b/home-manager/modules/default.nix
index 7dc030c..bb7e03f 100644
--- a/home-manager/modules/default.nix
+++ b/home-manager/modules/default.nix
@@ -9,7 +9,7 @@
     ./programs/email
     ./programs/evince
     ./programs/git
-    ./programs/keeweb
+    ./programs/keepassxc
     ./programs/mpv
     ./programs/open-port
     ./programs/rapid-photo-downloader
diff --git a/home-manager/modules/programs/keepassxc/default.nix b/home-manager/modules/programs/keepassxc/default.nix
new file mode 100644
index 0000000..62931c2
--- /dev/null
+++ b/home-manager/modules/programs/keepassxc/default.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.programs.az-keepassxc;
+in
+{
+  options = {
+    programs.az-keepassxc.enable = lib.mkEnableOption "Enable keepassxc.";
+  };
+
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [
+      keepassxc
+    ];
+    systemd.user.services.keepassxc = {
+      Unit = {
+        Description = "Start keepassxc";
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+      Service = {
+        ExecStart = "${pkgs.keepassxc}/bin/keepassxc";
+      };
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+    };
+  };
+}
diff --git a/home-manager/modules/programs/keeweb/default.nix b/home-manager/modules/programs/keeweb/default.nix
deleted file mode 100644
index d84e41b..0000000
--- a/home-manager/modules/programs/keeweb/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.programs.az-keeweb;
-in
-{
-  options = {
-    programs.az-keeweb.enable = lib.mkEnableOption "Enable keeweb.";
-  };
-
-  config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [
-      keeweb
-    ];
-
-    home.file.".config/qtile/autostart.d/keeweb.sh".source = ./keeweb.sh;
-  };
-}
diff --git a/home-manager/modules/programs/keeweb/keeweb.sh b/home-manager/modules/programs/keeweb/keeweb.sh
deleted file mode 100755
index 4528f81..0000000
--- a/home-manager/modules/programs/keeweb/keeweb.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-echo "start keeweb"
-nohup keeweb --in-process-gpu > ~/.local/share/nohup.out &
diff --git a/home-manager/modules/services/desktop-base/default.nix b/home-manager/modules/services/desktop-base/default.nix
index c5dcb3e..3d01d1d 100644
--- a/home-manager/modules/services/desktop-base/default.nix
+++ b/home-manager/modules/services/desktop-base/default.nix
@@ -14,7 +14,7 @@ in
       az-emacs.enable = true;
       az-email.enable = true;
       az-evince.enable = true;
-      az-keeweb.enable = true;
+      az-keepassxc.enable = true;
       az-mpv.enable = true;
       az-open-port.enable = true;
       az-signal.enable = true;
diff --git a/modules/services/qtile/config.py b/modules/services/qtile/config.py
index d80b5df..eae901a 100644
--- a/modules/services/qtile/config.py
+++ b/modules/services/qtile/config.py
@@ -88,7 +88,7 @@ group_matches = [
     None,  # 4
     None,  # 5
     [
-        Match(wm_class="KeeWeb"),
+        Match(wm_class="KeePassXC"),
         Match(wm_class="JDownloader"),
         Match(wm_class="Plexamp"),
     ],  # 6