--- a/modules/hosts.nix
+++ b/modules/hosts.nix
@@ -100,7 +100,10 @@
             # Default hostname generation
             nixos.networking.hostName = mkFleetGeneratorDefault config._module.args.name;
             # Default 'all' tag for every host
-            tags = [ "all" ];
+            tags = [
+              "all"
+              "system/${config.system}"
+            ];
           };
           _file = ./meta.nix;
         }