diff --git a/modules/wireguard-monitoring/default.nix b/modules/wireguard-monitoring/default.nix
index 94154ac..a7238e9 100644
--- a/modules/wireguard-monitoring/default.nix
+++ b/modules/wireguard-monitoring/default.nix
@@ -68,8 +68,10 @@ in {
               target_label = "unit";
             }
             {
-              source_labels = [ "__journal__systemd_user_unit" ];
-              target_label = "user_unit";
+              source_labels = [ "__journal__systemd_unit" "__journal__systemd_user_unit" ];
+              target_label = "unit";
+              regex = "(.*);(.+)";
+              replacement = "$2";
             }
           ];
         }];