diff --git a/modules/journalwatch.nix b/modules/journalwatch.nix
index ea1e011..b6e24e1 100644
--- a/modules/journalwatch.nix
+++ b/modules/journalwatch.nix
@@ -405,8 +405,8 @@
           \s+yoda : TTY=pts/[0-9] ; PWD=/\S+ ; USER=root ; COMMAND=/.+
           # yodaNas. If the btrbk service is run.
           \s+btrbk : PWD=/ ; USER=root ; COMMAND=/.+
-          \s+root : PWD=/ ; USER=root ; COMMAND=/nix/store/[a-z0-9]+-btrfs-progs-[0-9\.]+/bin/btrfs (subvolume list|subvolume show|subvolume delete --commit-each|send|receive) .+
-          \s+root : PWD=/ ; USER=root ; COMMAND=/nix/store/[a-z0-9]+-coreutils-[0-9\.]+/bin/readlink -v -e .+
+          \s+root : PWD=(/|/root) ; USER=root ; COMMAND=(/run/current-system/sw|/nix/store/[a-z0-9]+-btrfs-progs-[0-9\.]+)/bin/btrfs (subvolume list|subvolume show|subvolume delete|send|receive) .+
+          \s+root : PWD=(/|/root) ; USER=root ; COMMAND=(/run/current-system/sw|/nix/store/[a-z0-9]+-coreutils-[0-9\.]+)/bin/readlink -v -e .+
         '';
         match = "SYSLOG_IDENTIFIER = sudo";
       }
@@ -540,13 +540,14 @@
           WARNING: CPU: [0-9]+ PID: [0-9]+ at drivers/gpu/drm/i915/vlv_suspend\.c:.*
           Modules linked in:( \S+)+ ?
            irqbypass drivetemp drm deflate fuse( \S+)+
-          CPU: [0-9]+ PID: [0-9]+ Comm: kworker/\S+ Tainted: G        W          6.1.69 #1-NixOS
-          CPU: [0-9]+ PID: [0-9]+ Comm: kworker/\S+ Not tainted 6.1.69 #1-NixOS
+           irqbypass drm drivetemp deflate fuse( \S+)+
+          CPU: [0-9]+ PID: [0-9]+ Comm: kworker/\S+ Tainted: G        W          [0-9]+\.[0-9]+\.[0-9]+ #1-NixOS
+          CPU: [0-9]+ PID: [0-9]+ Comm: kworker/\S+ Not tainted [0-9]+\.[0-9]+\.[0-9]+ #1-NixOS
           Hardware name: To Be Filled By O\.E\.M\. To Be Filled By O\.E\.M\./N3150-ITX, BIOS P1\.10 05/20/2015
           Workqueue: pm pm_runtime_work
           Workqueue: events_unbound async_run_entry_fn
           RIP: .*:vlv_suspend_complete\+0x[0-9abcdef]+/0x[0-9abcdef]+ \[i915\]
-          Code: 8b 7b 08 4c 8b 67 50 4d 85 e4 74 25 e8 61 ([0-9a-f][0-9a-f] )+<0f> 0b e9 75 f9 ff ff 4c 8b 27 eb d6 66 66 2e 0f 1f 84 00 00 00 00
+          Code: 8b 7b 08 4c 8b 67 50 4d 85 e4 74 25 e8 ([0-9a-f][0-9a-f] )+<0f> 0b e9 75 f9 ff ff 4c 8b 27 eb d6 66 66 2e 0f 1f 84 00 00 00 00
           RSP: [0-9]+:[0-9a-f]+ EFLAGS: [0-9a-f]+
           RAX: 0000000000000000 RBX: [0-9a-f]+ RCX: [0-9a-f]+
           RDX: [0-9a-f]+ RSI: [0-9a-f]+ RDI: [0-9a-f]+