diff --git a/system/flakes/adsb-antenna.nix b/system/flakes/adsb-antenna.nix
index 6c03779..4dc562c 100644
--- a/system/flakes/adsb-antenna.nix
+++ b/system/flakes/adsb-antenna.nix
@@ -51,6 +51,8 @@ rec {
       targetHost = "adsb-antenna";
       targetPort = 22;
       targetUser = "root";
+
+      tags = [ "home" "rpi4" ];
     };
 
     nixpkgs.system = default-system;
diff --git a/system/flakes/argon.nix b/system/flakes/argon.nix
index b2842a6..505a792 100644
--- a/system/flakes/argon.nix
+++ b/system/flakes/argon.nix
@@ -54,6 +54,8 @@ rec {
       targetPort = 22;
       targetUser = "root";
       buildOnTarget = true;
+
+      tags = [ "home" "rpi4" ];
     };
 
     nixpkgs.system = default-system;
diff --git a/system/flakes/mediaserver.nix b/system/flakes/mediaserver.nix
index b2a97f1..9b2d7a1 100644
--- a/system/flakes/mediaserver.nix
+++ b/system/flakes/mediaserver.nix
@@ -52,6 +52,8 @@ rec {
       targetPort = 22;
       targetUser = "root";
       buildOnTarget = true;
+
+      tags = [ "home" ];
     };
 
     nixpkgs.system = default-system;
diff --git a/system/flakes/neon.nix b/system/flakes/neon.nix
index 55d1978..2bf64fc 100644
--- a/system/flakes/neon.nix
+++ b/system/flakes/neon.nix
@@ -54,6 +54,8 @@ rec {
       targetPort = 22;
       targetUser = "root";
       buildOnTarget = true;
+
+      tags = [ "home" "rpi4" ];
     };
 
     nixpkgs.system = default-system;
diff --git a/system/flakes/tanker.nix b/system/flakes/tanker.nix
index 4b07b5f..e82e9ff 100644
--- a/system/flakes/tanker.nix
+++ b/system/flakes/tanker.nix
@@ -58,6 +58,8 @@ rec {
       targetPort = 22;
       targetUser = "root";
       buildOnTarget = true;
+
+      tags = [ "remote" ];
     };
 
     nixpkgs.system = default-system;