diff --git a/home/user/hypr/exec.nix b/home/user/hypr/exec.nix
index 0eb711c..530fabb 100644
--- a/home/user/hypr/exec.nix
+++ b/home/user/hypr/exec.nix
@@ -6,6 +6,7 @@ let
   '';
 
   startupScript = pkgs.pkgs.writeShellScriptBin "start" ''
+    uwsm app -- ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1 &
     uwsm app -- ${swayncScript}/bin/swaync-start &
     dbus-update-activation-environment --systemd --all &
     systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
@@ -13,7 +14,7 @@ let
     uwsm app -- waybar -c ~/.config/waybar/config.json -s ~/.config/waybar/style.css &
     uwsm app -- swayidle -w &
     uwsm app -- sway-audio-idle-inhibit &
-    fcitx5 -rd &
+    uwsm fcitx5 -rd &
     uwsm app -- fcitx5-remote -r &
     uwsm app -- hyprsunset -t 3000k
   '';
diff --git a/system/modules/polkit.nix b/system/modules/polkit.nix
index f4cf2e9..cd010d3 100644
--- a/system/modules/polkit.nix
+++ b/system/modules/polkit.nix
@@ -1,26 +1,8 @@
 { pkgs, ... }:
 
 {
-  systemd = {
-    user.services.polkit-gnome-authentication-agent-1 = {
-      enable = true;
-      description = "polkit-gnome-authentication-agent-1";
-      wantedBy = [ "graphical-session.target" ];
-      wants = [ "graphical-session.target" ];
-      after = [ "graphical-session.target" ];
-      serviceConfig = {
-        Type = "simple";
-        ExecStart =
-          "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
-        Restart = "on-failure";
-        RestartSec = 1;
-        TimeoutStopSec = 10;
-      };
-    };
-    extraConfig = ''
-      DefaultTimeoutStopSec=10s
-    '';
-  };
-  services.gnome.gnome-keyring.enable = true;
   environment.systemPackages = with pkgs; [ polkit polkit_gnome ];
+  # polkit-gnome execution is handled by Hyprland exec.nix
+  # as hyprland do not cooperate with graphical-session.target
+  services.gnome.gnome-keyring.enable = true;
 }
diff --git a/system/modules/security.nix b/system/modules/security.nix
index 365b24e..245feef 100644
--- a/system/modules/security.nix
+++ b/system/modules/security.nix
@@ -10,9 +10,7 @@
   };
 
   security.pam.services = {
-    greetd.u2fAuth = true;
     sudo.u2fAuth = true;
-    # hyprlock.u2fAuth = true;
   };
 
   environment.systemPackages = with pkgs; [