diff --git a/bin/dunstctl b/bin/dunstctl
index ac58761..7ff1582 100755
--- a/bin/dunstctl
+++ b/bin/dunstctl
@@ -11,12 +11,12 @@ log() {
 case "$1" in
     enable)
         log "Enabling dunst"
-        systemctl --user --no-block kill --signal SIGUSR2 dunst_user
+        systemctl --user --no-block kill --signal SIGUSR2 user:dunst
 
         ;;
     disable)
         log "Disabling dunst"
-        systemctl --user --no-block kill --signal SIGUSR1 dunst_user
+        systemctl --user --no-block kill --signal SIGUSR1 user:dunst
         ;;
     *)
         >&2 printf 'Unknown command\n'
diff --git a/i3/scripts/presentation-mode b/i3/scripts/presentation-mode
index f9ccd8a..892c1a0 100755
--- a/i3/scripts/presentation-mode
+++ b/i3/scripts/presentation-mode
@@ -10,14 +10,14 @@ is_on() {
 switch_on() {
     touch "${_status_file}"
     dunstctl disable &
-    systemctl --user --no-block stop redshift_user
-    systemctl --user --no-block stop spotify
+    systemctl --user --no-block stop user:redshift
+    systemctl --user --no-block stop user:spotify
 }
 
 switch_off() {
     rm -f "${_status_file}"
     dunstctl enable &
-    "$_autostart" redshift_user spotify
+    "$_autostart" redshift spotify
 }
 
 
diff --git a/user.yml b/user.yml
index fab0c9b..e3bb78d 100644
--- a/user.yml
+++ b/user.yml
@@ -66,6 +66,19 @@
   become: true
   become_user: root
 
+- name: disable and mask systemd user units
+  systemd:
+    name: "{{ item }}"
+    enabled: false
+    masked: true
+    scope: user
+  with_items:
+    - gpg-agent.service
+    - gpg-agent.socket
+    - gpg-agent-browser.socket
+    - gpg-agent-ssh.socket
+  tags: [test]
+
 - name: create directory for getty autologin
   file:
     state: directory