diff --git a/apparmor.d/groups/systemd/systemd-sleep b/apparmor.d/groups/systemd/systemd-sleep
index 80da50b7..fd861c57 100644
--- a/apparmor.d/groups/systemd/systemd-sleep
+++ b/apparmor.d/groups/systemd/systemd-sleep
@@ -19,21 +19,17 @@ profile systemd-sleep @{exec_path} {
 
   @{exec_path} mr,
 
-  /{usr/,}bin/{,ba,da}sh                   rix,
-  /{usr/,}bin/nvidia-sleep.sh              rix,
-  /{usr/,}lib/systemd/system-sleep/hdparm  rix,
-  /{usr/,}lib/systemd/system-sleep/nvidia  rix,
-  /{usr/,}lib/systemd/system-sleep/sysstat.sleep rPUx,
-  /{usr/,}lib/systemd/system-sleep/unattended-upgrades rix,
+  /{usr/,}lib/systemd/system-sleep/hdparm               rPx,
+  /{usr/,}lib/systemd/system-sleep/nvidia               rPx,
+  /{usr/,}lib/systemd/system-sleep/sysstat.sleep        rPx,
+  /{usr/,}lib/systemd/system-sleep/unattended-upgrades  rPx,
+  /{usr/,}lib/systemd/system-sleep/grub2.sleep          rPx,
 
   /etc/systemd/sleep.conf r,
   /etc/systemd/sleep.conf.d/{,*} r,
 
   @{sys}/power/state rw,
 
-  @{PROC}/driver/nvidia/suspend w,
-
-  /dev/tty rw,
 
   include if exists <local/systemd-sleep>
 }
diff --git a/apparmor.d/groups/systemd/systemd-sleep-grub2 b/apparmor.d/groups/systemd/systemd-sleep-grub2
new file mode 100644
index 00000000..ea2cc419
--- /dev/null
+++ b/apparmor.d/groups/systemd/systemd-sleep-grub2
@@ -0,0 +1,24 @@
+# apparmor.d - Full set of apparmor profiles
+# Copyright (C) 2023 Alexandre Pujol <alexandre@pujol.io>
+# SPDX-License-Identifier: GPL-2.0-only
+
+abi <abi/3.0>,
+
+include <tunables/global>
+
+@{exec_path} = /{usr/,}lib/systemd/system-sleep/grub2.sleep
+profile systemd-sleep-nvidia @{exec_path} {
+  include <abstractions/base>
+
+  @{exec_path} mr,
+
+  /{usr/,}bin/{,ba,da}sh       rix,
+  /{usr/,}bin/grep             rix,
+  /{usr/,}bin/uname            rix,
+
+  /etc/sysconfig/bootloader r,
+
+  @{PROC}/@{pid}/maps r,
+
+  include if exists <local/systemd-sleep-nvidia>
+}
\ No newline at end of file
diff --git a/apparmor.d/groups/systemd/systemd-sleep-hdparm b/apparmor.d/groups/systemd/systemd-sleep-hdparm
new file mode 100644
index 00000000..ee4d1de6
--- /dev/null
+++ b/apparmor.d/groups/systemd/systemd-sleep-hdparm
@@ -0,0 +1,16 @@
+# apparmor.d - Full set of apparmor profiles
+# Copyright (C) 2023 Alexandre Pujol <alexandre@pujol.io>
+# SPDX-License-Identifier: GPL-2.0-only
+
+abi <abi/3.0>,
+
+include <tunables/global>
+
+@{exec_path} = /{usr/,}lib/systemd/system-sleep/hdparm
+profile systemd-sleep-hdparm @{exec_path} {
+  include <abstractions/base>
+
+  @{exec_path} mr,
+
+  include if exists <local/systemd-sleep-hdparm>
+}
\ No newline at end of file
diff --git a/apparmor.d/groups/systemd/systemd-sleep-nvidia b/apparmor.d/groups/systemd/systemd-sleep-nvidia
new file mode 100644
index 00000000..441fb69f
--- /dev/null
+++ b/apparmor.d/groups/systemd/systemd-sleep-nvidia
@@ -0,0 +1,33 @@
+# apparmor.d - Full set of apparmor profiles
+# Copyright (C) 2023 Alexandre Pujol <alexandre@pujol.io>
+# SPDX-License-Identifier: GPL-2.0-only
+
+abi <abi/3.0>,
+
+include <tunables/global>
+
+@{exec_path} = /{usr/,}lib/systemd/system-sleep/nvidia
+profile systemd-sleep-nvidia @{exec_path} {
+  include <abstractions/base>
+  include <abstractions/nameservice-strict>
+
+  capability sys_admin,
+  capability sys_tty_config,
+
+  @{exec_path} mr,
+
+  /{usr/,}bin/{,ba,da}sh       rix,
+  /{usr/,}bin/nvidia-sleep.sh  rix,
+  /{usr/,}bin/chvt             rix,
+  /{usr/,}bin/cat              rix,
+  /{usr/,}bin/rm               rix,
+
+  @{run}/nvidia-sleep/* rw,
+
+  @{PROC}/driver/nvidia/suspend w,
+
+  /dev/tty rw,
+  /dev/tty[0-9]* rw,
+
+  include if exists <local/systemd-sleep-nvidia>
+}
\ No newline at end of file
diff --git a/apparmor.d/groups/systemd/systemd-sleep-sysstat b/apparmor.d/groups/systemd/systemd-sleep-sysstat
new file mode 100644
index 00000000..993d1565
--- /dev/null
+++ b/apparmor.d/groups/systemd/systemd-sleep-sysstat
@@ -0,0 +1,16 @@
+# apparmor.d - Full set of apparmor profiles
+# Copyright (C) 2023 Alexandre Pujol <alexandre@pujol.io>
+# SPDX-License-Identifier: GPL-2.0-only
+
+abi <abi/3.0>,
+
+include <tunables/global>
+
+@{exec_path} = /{usr/,}lib/systemd/system-sleep/sysstat.sleep
+profile systemd-sleep-sysstat @{exec_path} {
+  include <abstractions/base>
+
+  @{exec_path} mr,
+
+  include if exists <local/systemd-sleep-sysstat>
+}
\ No newline at end of file
diff --git a/apparmor.d/groups/systemd/systemd-sleep-upgrades b/apparmor.d/groups/systemd/systemd-sleep-upgrades
new file mode 100644
index 00000000..267275ea
--- /dev/null
+++ b/apparmor.d/groups/systemd/systemd-sleep-upgrades
@@ -0,0 +1,16 @@
+# apparmor.d - Full set of apparmor profiles
+# Copyright (C) 2023 Alexandre Pujol <alexandre@pujol.io>
+# SPDX-License-Identifier: GPL-2.0-only
+
+abi <abi/3.0>,
+
+include <tunables/global>
+
+@{exec_path} = /{usr/,}lib/systemd/system-sleep/unattended-upgrades
+profile systemd-sleep-upgrades @{exec_path} {
+  include <abstractions/base>
+
+  @{exec_path} mr,
+
+  include if exists <local/systemd-sleep-upgrades>
+}
\ No newline at end of file