diff --git a/flake.nix b/flake.nix
index 880220f..a2d470c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,13 +56,14 @@
             type = "app";
             program = "${mkMorphDeploy "on" name}";
           };
-        }) machines)) // (builtins.listToAttrs (map (name: {
-          name = "tag-${name}";
-          value = {
-            type = "app";
-            program = "${mkMorphDeploy "tagged" name}";
-          };
-        }) tags)) // {
+        }) machines)) // {
+          tags = builtins.listToAttrs (map (name: {
+            inherit name;
+            value = {
+              type = "app";
+              program = "${mkMorphDeploy "tagged" name}";
+            };
+          }) tags);
           maui = {
             type = "app";
             program = "${mkStandaloneHmDeploy "maui"}";