diff --git a/Justfile b/Justfile
index 7753ad2d1..f9ce13c36 100644
--- a/Justfile
+++ b/Justfile
@@ -2,18 +2,8 @@
 # Copyright (C) 2025 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-# Usage:
-#   just
-#   just img ubuntu24 server
-#   just vm ubuntu24 server
-#   just up ubuntu24 server
-#   just ssh ubuntu24 server
-#   just halt ubuntu24 server
-#   just destroy ubuntu24 server
-#   just list
-#   just images
-#   just available
-#   just clean
+# Usage: `just`
+# See https://apparmor.pujol.io/development/ for more information.
 
 # Build setings
 destdir := "/"
@@ -125,7 +115,7 @@ install:
 
 [group('install')]
 [doc('Locally install prebuild profiles')]
-local +args:
+local +names:
 	#!/usr/bin/env bash
 	set -eu -o pipefail
 	install -Dm0755 {{build}}/aa-log {{destdir}}/usr/bin/aa-log
@@ -138,7 +128,7 @@ local +args:
 		install -Dm0644 "{{build}}/apparmor.d/tunables/$file" "{{destdir}}/etc/apparmor.d/tunables/$file"
 	done;
 	echo "Warning: profile dependencies fallback to unconfined."
-	for file in {{args}}; do
+	for file in {{names}}; do
 		grep -Ei 'rPx|rpx' "{{build}}/apparmor.d/$file" || true
 		sed -i -e "s/rPx/rPUx/g" "{{build}}/apparmor.d/$file"
 		install -Dvm0644 "{{build}}/apparmor.d/$file" "{{destdir}}/etc/apparmor.d/$file"
@@ -336,15 +326,52 @@ available:
 
 
 [group('tests')]
-[doc('Run the integration tests on the machine')]
-integration dist flavor:
-	@ssh {{sshopt}} user@`just get_ip {{dist}} {{flavor}}` \
-		cp -rf /home/user/Projects/apparmor.d/tests/integration/ /home/user/Projects
-	@ssh {{sshopt}} user@`just get_ip {{dist}} {{flavor}}` \
-		sudo umount /home/user/Projects/apparmor.d
-	@ssh {{sshopt}} user@`just get_ip {{dist}} {{flavor}}` \
-		@bats --recursive --timing --print-output-on-failure Projects/integration/
+[doc('Install dependencies for the integration tests')]
+init:
+	@bash tests/requirements.sh
 
+[group('tests')]
+[doc('Run the integration tests')]
+integration:
+	bats --recursive --pretty --timing --print-output-on-failure tests/integration
+
+[group('tests')]
+[doc('Install dependencies for the integration tests (machine)')]
+tests-init dist flavor:
+	@ssh {{sshopt}} {{username}}@`just get_ip {{dist}} {{flavor}}` \
+		just --justfile /home/{{username}}/Projects/apparmor.d/Justfile init
+
+[group('tests')]
+[doc('Synchronize the integration tests (machine)')]
+tests-sync dist flavor:
+	@ssh {{sshopt}} {{username}}@`just get_ip {{dist}} {{flavor}}` \
+		rsync -a --delete /home/{{username}}/Projects/apparmor.d/tests/ /home/{{username}}/Projects/tests/
+
+[group('tests')]
+[doc('Re-synchronize the integration tests (machine)')]
+tests-resync dist flavor: (tests-mount dist flavor) \
+	(tests-sync dist flavor) \
+	(tests-umount dist flavor)
+
+[group('tests')]
+[doc('Unmout the integration tests (machine)')]
+tests-umount dist flavor:
+	@ssh {{sshopt}} {{username}}@`just get_ip {{dist}} {{flavor}}` \
+		sudo umount /home/{{username}}/Projects/apparmor.d
+
+[group('tests')]
+[doc('Run the integration tests (machine)')]
+tests-run dist flavor name="":
+	ssh {{sshopt}} {{username}}@`just get_ip {{dist}} {{flavor}}` \
+		TERM=xterm \
+		bats --recursive --pretty --timing --print-output-on-failure \
+			/home/{{username}}/Projects/tests/integration/{{name}}
+
+[group('tests')]
+[doc('Mount integration tests (machine)')]
+tests-mount dist flavor:
+	@ssh {{sshopt}} {{username}}@`just get_ip {{dist}} {{flavor}}` \
+		sudo mount 0a31bc478ef8e2461a4b1cc10a24cc4
 
 [private]
 get_ip dist flavor:
diff --git a/apparmor.d/groups/systemd/bootctl b/apparmor.d/groups/systemd/bootctl
index f7d001c70..47e8737fe 100644
--- a/apparmor.d/groups/systemd/bootctl
+++ b/apparmor.d/groups/systemd/bootctl
@@ -13,6 +13,7 @@ profile bootctl @{exec_path} flags=(attach_disconnected,mediate_deleted) {
   include <abstractions/disks-read>
   include <abstractions/common/systemd>
 
+  capability linux_immutable,
   capability mknod,
   capability net_admin,
   capability sys_resource,
@@ -47,8 +48,8 @@ profile bootctl @{exec_path} flags=(attach_disconnected,mediate_deleted) {
   @{sys}/firmware/dmi/entries/*/raw r,
   @{sys}/firmware/efi/efivars/ r,
   @{sys}/firmware/efi/efivars/AuditMode-@{uuid} r,
-  @{sys}/firmware/efi/efivars/Boot@{hex}-@{uuid} r,
-  @{sys}/firmware/efi/efivars/BootOrder-@{uuid} r,
+  @{sys}/firmware/efi/efivars/Boot@{hex}-@{uuid} rw,
+  @{sys}/firmware/efi/efivars/BootOrder-@{uuid} rw,
   @{sys}/firmware/efi/efivars/DeployedMode-@{uuid} r,
   @{sys}/firmware/efi/efivars/LoaderDevicePartUUID-@{uuid} r,
   @{sys}/firmware/efi/efivars/LoaderEntries-@{uuid} r,
@@ -59,7 +60,7 @@ profile bootctl @{exec_path} flags=(attach_disconnected,mediate_deleted) {
   @{sys}/firmware/efi/efivars/LoaderImageIdentifier-@{uuid} r,
   @{sys}/firmware/efi/efivars/LoaderInfo-@{uuid} r,
   @{sys}/firmware/efi/efivars/LoaderSystemToken-@{uuid} rw,
-  @{sys}/firmware/efi/efivars/OsIndications-@{uuid} r,
+  @{sys}/firmware/efi/efivars/OsIndications-@{uuid} rw,
   @{sys}/firmware/efi/efivars/OsIndicationsSupported-@{uuid} r,
   @{sys}/firmware/efi/efivars/SecureBoot-@{uuid} r,
   @{sys}/firmware/efi/efivars/SetupMode-@{uuid} r,
diff --git a/apparmor.d/groups/systemd/busctl b/apparmor.d/groups/systemd/busctl
index c31b28836..04ed76e72 100644
--- a/apparmor.d/groups/systemd/busctl
+++ b/apparmor.d/groups/systemd/busctl
@@ -48,6 +48,13 @@ profile busctl @{exec_path} flags=(attach_disconnected) {
        member={GetConnectionCredentials,ListNames,ListActivatableNames}
        peer=(name=org.freedesktop.DBus, label="@{p_dbus_session}"),
 
+  dbus send bus=system
+       interface=org.freedesktop.DBus.Introspectable
+       member=Introspect,
+  dbus send bus=system
+       interface=org.freedesktop.DBus.Properties
+       member={GetAll,Get},
+
   @{exec_path} mr,
 
   @{pager_path} rPx -> child-pager,
diff --git a/apparmor.d/groups/systemd/journalctl b/apparmor.d/groups/systemd/journalctl
index ef62e37cd..c852b3756 100644
--- a/apparmor.d/groups/systemd/journalctl
+++ b/apparmor.d/groups/systemd/journalctl
@@ -30,6 +30,9 @@ profile journalctl @{exec_path} flags=(attach_disconnected) {
 
   @{pager_path} rPx -> child-pager,
 
+  @{bin}/* r,
+  @{sbin}/* r,
+
   /var/lib/dbus/machine-id r,
   /etc/machine-id r,
 
diff --git a/apparmor.d/groups/systemd/networkctl b/apparmor.d/groups/systemd/networkctl
index 5b4b3e6b5..0fd89c199 100644
--- a/apparmor.d/groups/systemd/networkctl
+++ b/apparmor.d/groups/systemd/networkctl
@@ -11,6 +11,7 @@ include <tunables/global>
 profile networkctl @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/bus-system>
+  include <abstractions/nameservice-strict>
 
   capability net_admin,
   capability sys_module,
@@ -52,6 +53,7 @@ profile networkctl @{exec_path} flags=(attach_disconnected) {
 
   @{att}/@{run}/systemd/netif/io.systemd.Network rw,
 
+  @{run}/systemd/netif/links/ r,
   @{run}/systemd/netif/leases/@{int} r,
   @{run}/systemd/netif/links/@{int} r,
   @{run}/systemd/netif/state r,
@@ -63,6 +65,7 @@ profile networkctl @{exec_path} flags=(attach_disconnected) {
 
         @{PROC}/1/cgroup r,
         @{PROC}/cmdline r,
+        @{PROC}/sys/fs/nr_open r,
         @{PROC}/sys/kernel/osrelease r,
         @{PROC}/sys/kernel/random/boot_id r,
   owner @{PROC}/@{pid}/cgroup r,
diff --git a/apparmor.d/groups/systemd/systemd-localed b/apparmor.d/groups/systemd/systemd-localed
index 104a141ce..c15eaf5b2 100644
--- a/apparmor.d/groups/systemd/systemd-localed
+++ b/apparmor.d/groups/systemd/systemd-localed
@@ -33,8 +33,8 @@ profile systemd-localed @{exec_path} flags=(attach_disconnected) {
   /etc/default/locale rw,
   /etc/locale.conf rw,
   /etc/vconsole.conf rw,
-  /etc/X11/xorg.conf.d/ r,
-  /etc/X11/xorg.conf.d/.#*.confd* rw,
+  /etc/X11/xorg.conf.d/ rw,
+  /etc/X11/xorg.conf.d/.#*.conf@{hex} rw,
   /etc/X11/xorg.conf.d/*.conf rw,
 
   @{att}/@{run}/systemd/notify rw,
diff --git a/apparmor.d/groups/systemd/systemd-machined b/apparmor.d/groups/systemd/systemd-machined
index b9244ece6..520080082 100644
--- a/apparmor.d/groups/systemd/systemd-machined
+++ b/apparmor.d/groups/systemd/systemd-machined
@@ -37,6 +37,8 @@ profile systemd-machined @{exec_path} flags=(attach_disconnected) {
 
   ptrace read peer=systemd-nspawn,
 
+  unix type=stream addr=@@{udbus}/bus/systemd-machine/system,
+
   #aa:dbus own bus=system name=org.freedesktop.machine1
 
   #aa:dbus talk bus=system name=org.freedesktop.systemd1 label="@{p_systemd}"
@@ -71,6 +73,7 @@ profile systemd-machined @{exec_path} flags=(attach_disconnected) {
   /dev/ptmx rw,
   /dev/pts/@{int} rw,
   /dev/pts/ptmx rw,
+  /dev/vsock r,
 
   include if exists <local/systemd-machined>
 }
diff --git a/apparmor.d/groups/systemd/systemd-networkd b/apparmor.d/groups/systemd/systemd-networkd
index df1e74048..5105c69b8 100644
--- a/apparmor.d/groups/systemd/systemd-networkd
+++ b/apparmor.d/groups/systemd/systemd-networkd
@@ -60,9 +60,13 @@ profile systemd-networkd @{exec_path} flags=(attach_disconnected) {
   @{att}/@{run}/systemd/notify rw,
 
   @{run}/mount/utab r,
+  @{run}/systemd/resolve/resolv.conf r,
 
   owner @{att}/var/lib/systemd/network/ r,
 
+  owner /var/lib/systemd/network/ rw,
+  owner /var/lib/systemd/network/** rwk,
+
         @{run}/systemd/network/ r,
         @{run}/systemd/network/*.network r,
   owner @{run}/systemd/netif/** rw,
diff --git a/apparmor.d/groups/systemd/systemd-nsresourcework b/apparmor.d/groups/systemd/systemd-nsresourcework
index 734717c44..5b8d53398 100644
--- a/apparmor.d/groups/systemd/systemd-nsresourcework
+++ b/apparmor.d/groups/systemd/systemd-nsresourcework
@@ -16,6 +16,8 @@ profile systemd-nsresourcework @{exec_path} {
 
   @{exec_path} mr,
 
+  @{run}/systemd/nsresource/registry/ r,
+
   include if exists <local/systemd-nsresourcework>
 }
 
diff --git a/apparmor.d/groups/systemd/systemd-userwork b/apparmor.d/groups/systemd/systemd-userwork
index 29641fd74..2521c655e 100644
--- a/apparmor.d/groups/systemd/systemd-userwork
+++ b/apparmor.d/groups/systemd/systemd-userwork
@@ -18,6 +18,7 @@ profile systemd-userwork @{exec_path} flags=(attach_disconnected) {
 
   @{exec_path} mr,
 
+  /etc/gshadow r,
   /etc/machine-id r,
   /etc/shadow r,
 
diff --git a/apparmor.d/groups/systemd/userdbctl b/apparmor.d/groups/systemd/userdbctl
index 97625db38..fa7c13297 100644
--- a/apparmor.d/groups/systemd/userdbctl
+++ b/apparmor.d/groups/systemd/userdbctl
@@ -7,7 +7,7 @@ abi <abi/4.0>,
 include <tunables/global>
 
 @{exec_path} = @{bin}/userdbctl
-profile userdbctl @{exec_path} {
+profile userdbctl @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/consoles>
   include <abstractions/nameservice-strict>
@@ -29,6 +29,7 @@ profile userdbctl @{exec_path} {
         @{PROC}/1/cgroup r,
   owner @{PROC}/@{pid}/cgroup r,
   owner @{PROC}/@{pid}/gid_map r,
+  owner @{PROC}/@{pid}/setgroups r,
   owner @{PROC}/@{pid}/uid_map r,
 
   include if exists <local/userdbctl>