diff --git a/pkgs/clan-cli/clan_cli/templates/apply_disk.py b/pkgs/clan-cli/clan_cli/templates/apply_disk.py
index 1836a63a2..1f85c199f 100644
--- a/pkgs/clan-cli/clan_cli/templates/apply_disk.py
+++ b/pkgs/clan-cli/clan_cli/templates/apply_disk.py
@@ -3,8 +3,8 @@ import logging
 from collections.abc import Sequence
 from typing import Any
 
-from clan_lib.api.disk import set_machine_disk_schema
 from clan_lib.machines.machines import Machine
+from clan_lib.templates.disk import set_machine_disk_schema
 
 from clan_cli.completions import (
     add_dynamic_completer,
diff --git a/pkgs/clan-cli/clan_lib/machines/list.py b/pkgs/clan-cli/clan_lib/machines/list.py
index dd2b002b8..333b71141 100644
--- a/pkgs/clan-cli/clan_lib/machines/list.py
+++ b/pkgs/clan-cli/clan_lib/machines/list.py
@@ -5,13 +5,13 @@ from dataclasses import dataclass
 from clan_cli.machines.hardware import HardwareConfig
 
 from clan_lib.api import API
-from clan_lib.api.disk import MachineDiskMatter
 from clan_lib.dirs import specific_machine_dir
 from clan_lib.flake import Flake
 from clan_lib.machines.actions import get_machine, list_machines
 from clan_lib.machines.machines import Machine
 from clan_lib.nix_models.clan import InventoryMachine
 from clan_lib.services.modules import parse_frontmatter
+from clan_lib.templates.disk import MachineDiskMatter
 
 log = logging.getLogger(__name__)
 
diff --git a/pkgs/clan-cli/clan_lib/api/disk.py b/pkgs/clan-cli/clan_lib/templates/disk.py
similarity index 99%
rename from pkgs/clan-cli/clan_lib/api/disk.py
rename to pkgs/clan-cli/clan_lib/templates/disk.py
index 207fccefc..49a897bc0 100644
--- a/pkgs/clan-cli/clan_lib/api/disk.py
+++ b/pkgs/clan-cli/clan_lib/templates/disk.py
@@ -6,12 +6,12 @@ from typing import Any, TypedDict
 from uuid import uuid4
 
 from clan_lib.api import API
-from clan_lib.api.modules import Frontmatter, extract_frontmatter
 from clan_lib.dirs import TemplateType, clan_templates
 from clan_lib.errors import ClanError
 from clan_lib.git import commit_file
 from clan_lib.machines.hardware import HardwareConfig, get_machine_hardware_config
 from clan_lib.machines.machines import Machine
+from clan_lib.services.modules import Frontmatter, extract_frontmatter
 
 log = logging.getLogger(__name__)
 
diff --git a/pkgs/clan-cli/clan_lib/tests/test_create.py b/pkgs/clan-cli/clan_lib/tests/test_create.py
index 7f0efcd1d..23c38a1af 100644
--- a/pkgs/clan-cli/clan_lib/tests/test_create.py
+++ b/pkgs/clan-cli/clan_lib/tests/test_create.py
@@ -16,7 +16,6 @@ from clan_cli.secrets.sops import maybe_get_admin_public_keys
 from clan_cli.secrets.users import add_user
 from clan_cli.vars.generate import get_generators, run_generators
 
-from clan_lib.api.disk import hw_main_disk_options, set_machine_disk_schema
 from clan_lib.cmd import RunOpts, run
 from clan_lib.dirs import specific_machine_dir
 from clan_lib.errors import ClanError
@@ -34,6 +33,7 @@ from clan_lib.persist.inventory_store import InventoryStore
 from clan_lib.persist.util import set_value_by_path
 from clan_lib.services.modules import list_modules
 from clan_lib.ssh.remote import Remote, check_machine_ssh_login
+from clan_lib.templates.disk import hw_main_disk_options, set_machine_disk_schema
 
 log = logging.getLogger(__name__)