diff --git a/pkgs/clan-cli/clan_cli/facts/generate.py b/pkgs/clan-cli/clan_cli/facts/generate.py
index 4751fe56a..d2d10ac07 100644
--- a/pkgs/clan-cli/clan_cli/facts/generate.py
+++ b/pkgs/clan-cli/clan_cli/facts/generate.py
@@ -10,6 +10,7 @@ from tempfile import TemporaryDirectory
 from clan_lib.cmd import RunOpts, run
 from clan_lib.errors import ClanError
 from clan_lib.git import commit_files
+from clan_lib.machines.list import list_full_machines
 from clan_lib.machines.machines import Machine
 from clan_lib.nix import nix_shell
 
@@ -18,7 +19,6 @@ from clan_cli.completions import (
     complete_machines,
     complete_services_for_machine,
 )
-from clan_cli.machines.list import list_full_machines
 
 from .check import check_secrets
 from .public_modules import FactStoreBase
diff --git a/pkgs/clan-cli/clan_cli/machines/list.py b/pkgs/clan-cli/clan_cli/machines/list.py
index 84ed970cb..6d4f81972 100644
--- a/pkgs/clan-cli/clan_cli/machines/list.py
+++ b/pkgs/clan-cli/clan_cli/machines/list.py
@@ -2,7 +2,8 @@ import argparse
 import logging
 
 from clan_lib.flake import Flake
-from clan_lib.machines.list import list_full_machines, query_machines_by_tags
+from clan_lib.machines.actions import list_machines
+from clan_lib.machines.list import query_machines_by_tags
 
 from clan_cli.completions import add_dynamic_completer, complete_tags
 
@@ -16,7 +17,7 @@ def list_command(args: argparse.Namespace) -> None:
         for name in query_machines_by_tags(flake, args.tags):
             print(name)
     else:
-        for name in list_full_machines(flake):
+        for name in list_machines(flake):
             print(name)
 
 
diff --git a/pkgs/clan-cli/clan_cli/machines/update.py b/pkgs/clan-cli/clan_cli/machines/update.py
index c6ad2b119..03473e608 100644
--- a/pkgs/clan-cli/clan_cli/machines/update.py
+++ b/pkgs/clan-cli/clan_cli/machines/update.py
@@ -4,6 +4,7 @@ import sys
 
 from clan_lib.async_run import AsyncContext, AsyncOpts, AsyncRuntime
 from clan_lib.errors import ClanError
+from clan_lib.machines.list import list_full_machines
 from clan_lib.machines.machines import Machine
 from clan_lib.machines.suggestions import validate_machine_names
 from clan_lib.machines.update import deploy_machine
@@ -15,7 +16,7 @@ from clan_cli.completions import (
     complete_machines,
     complete_tags,
 )
-from clan_cli.machines.list import list_full_machines, query_machines_by_tags
+from clan_cli.machines.list import query_machines_by_tags
 
 log = logging.getLogger(__name__)
 
diff --git a/pkgs/clan-cli/clan_cli/vars/generate.py b/pkgs/clan-cli/clan_cli/vars/generate.py
index 40a0cb2d1..c3da5e364 100644
--- a/pkgs/clan-cli/clan_cli/vars/generate.py
+++ b/pkgs/clan-cli/clan_cli/vars/generate.py
@@ -14,7 +14,6 @@ from clan_cli.completions import (
     complete_machines,
     complete_services_for_machine,
 )
-from clan_cli.machines.list import list_full_machines
 from clan_cli.vars._types import StoreBase
 from clan_cli.vars.migration import check_can_migrate, migrate_files
 from clan_lib.api import API
@@ -22,6 +21,7 @@ from clan_lib.cmd import RunOpts, run
 from clan_lib.errors import ClanError
 from clan_lib.flake import Flake
 from clan_lib.git import commit_files
+from clan_lib.machines.list import list_full_machines
 from clan_lib.nix import nix_config, nix_shell, nix_test_store
 
 from .check import check_vars
diff --git a/pkgs/clan-cli/clan_lib/machines/actions_test.py b/pkgs/clan-cli/clan_lib/machines/actions_test.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/pkgs/clan-cli/clan_lib/machines/list.py b/pkgs/clan-cli/clan_lib/machines/list.py
index d12b14689..3f4f1adb0 100644
--- a/pkgs/clan-cli/clan_lib/machines/list.py
+++ b/pkgs/clan-cli/clan_lib/machines/list.py
@@ -31,6 +31,7 @@ def list_full_machines(flake: Flake) -> dict[str, Machine]:
     return res
 
 
+# TODO: Add filter to list_machines -> list_machines(flake, filter={tags=...})
 def query_machines_by_tags(flake: Flake, tags: list[str]) -> dict[str, Machine]:
     """
     Query machines by their respective tags, if multiple tags are specified