diff --git a/dots/.config/systemd/user/compositor.target b/dots/.config/systemd/user/compositor.target
new file mode 100644
index 00000000..183d285c
--- /dev/null
+++ b/dots/.config/systemd/user/compositor.target
@@ -0,0 +1,4 @@
+[Unit]
+Description=Compositor target for WM to be launched manually
+Requires=graphical-session.target
+After=graphical-session.target
diff --git a/dots/.config/systemd/user/polkit.service b/dots/.config/systemd/user/polkit.service
index 26d37b37..ab2b96c8 100644
--- a/dots/.config/systemd/user/polkit.service
+++ b/dots/.config/systemd/user/polkit.service
@@ -1,14 +1,16 @@
 [Unit]
 Description=KDE PolicyKit Authentication Agent
-PartOf=graphical-session.target
+PartOf=compositor.target
+After=compositor.target
 
 [Service]
 ExecStart=/usr/lib/polkit-kde-authentication-agent-1
 ExecStop=kill -HUP $MAINPID
-BusName=org.kde.polkit-kde-authentication-agent-1
+ExecCondition=/bin/sh -c "[ -n $WAYLAND_DISPLAY ]"
 Slice=background.slice
+BusName=org.kde.polkit-kde-authentication-agent-1
 TimeoutSec=5sec
 Restart=on-failure
 
 [Install]
-WantedBy=graphical-session.target
+WantedBy=compositor.target