diff --git a/modules/journalwatch.nix b/modules/journalwatch.nix
index 5859776..e68eb3a 100644
--- a/modules/journalwatch.nix
+++ b/modules/journalwatch.nix
@@ -44,6 +44,11 @@
     # `filters` are always regular expressions.
     # All regular expressions have to match the full string!
     filterBlocks = [
+
+      #
+      # _SYSTEMD_UNIT
+      #
+
       { # yodaTux
         filters = ''
          .*
@@ -62,22 +67,23 @@
         '';
         match = "_SYSTEMD_UNIT = sshd.service";
       }
-      { # yodaTux
+      { # yodaTux, yodaYoga
         filters = ''
           The system will suspend now!
+          System is powering down\.
         '';
         match = "_SYSTEMD_UNIT = systemd-logind.service";
       }
       { # yodaTux
         filters = ''
-          Reexecuting.
-          finished switching to system configuration /nix/store/.+-nixos-system-.+-[0-9]+\.[0-9]+pre-git
+          Reexecuting\.
+          (finished )?switching to system configuration /nix/store/.+-nixos-system-.+-[0-9]+\.[0-9]+pre-git
         '';
         match = "_SYSTEMD_UNIT = user@0.service";
       }
       { # yodaTux
         filters = ''
-          Reexecuting.
+          Reexecuting\.
           (finished )?switching to system configuration /nix/store/.+-nixos-system-.+-[0-9]+\.[0-9]+pre-git
         '';
         match = "_SYSTEMD_UNIT = user@1000.service";
@@ -85,7 +91,7 @@
       { # yodaTux
         filters = ''
           Reloading rules
-          Collecting garbage unconditionally...
+          Collecting garbage unconditionally\.\.\.
           Loading rules from directory /.+
           Finished loading, compiling and executing [0-9]+ rules
         '';
@@ -128,6 +134,14 @@
         '';
         match = "SYSLOG_IDENTIFIER = nixos";
       }
+      { # yodaYoga
+        filters = ''
+          docker\.service: Consumed [0-9]+h [0-9]+min [0-9]+\.[0-9]+s CPU time, read [0-9]+\.[0-9]+M from disk, written [0-9]+\.[0-9]+G to disk, received [0-9]+\.[0-9]+M IP traffic, sent [0-9]+\.[0-9]+M IP traffic\.
+          #
+          Shutting down\.
+        '';
+        match = "SYSLOG_IDENTIFIER = systemd";
+      }
       { # yodaTux
         filters = ''
           .*