diff --git a/cli/administration/deploy/development/inventory/__init__.py b/cli/administration/deploy/development/inventory/__init__.py
index a4b035f80f..a5cea95d12 100644
--- a/cli/administration/deploy/development/inventory/__init__.py
+++ b/cli/administration/deploy/development/inventory/__init__.py
@@ -3,7 +3,7 @@
 Anything that wants to materialise the development inventory MUST go
 through :func:`build_dev_inventory` (single folder) or
 :func:`build_dev_inventory_matrix` (one folder per matrix-deploy round).
-Both flow through :class:`DevInventorySpec` and own:
+Both flow through :class:`~.spec.DevInventorySpec` and own:
 
 * the SPOT vars-file (``DEV_INVENTORY_VARS_FILE``),
 * per-app variant baking (each role's ``meta/variants.yml`` is resolved
@@ -18,7 +18,7 @@ function so wrapper and init step compute the same plan independently.
 
 Internal layout (one module per responsibility):
 
-* :mod:`.spec`            — :class:`DevInventorySpec` + ``PlanEntry`` type
+* :mod:`.spec`            — :class:`~.spec.DevInventorySpec` + ``PlanEntry`` type
 * :mod:`.payload`         — variant payload pick + ``--vars`` bake
 * :mod:`.legacy_resolver` — ``CombinedResolver``-driven include resolution
 * :mod:`.planner`         — :func:`plan_dev_inventory_matrix`
@@ -28,6 +28,11 @@ The private helpers (``_resolve_round_include`` and friends) are
 re-exported below because unit tests historically patch them under this
 package path. New tests SHOULD patch the submodule path directly
 (e.g. ``inventory.legacy_resolver._resolve_round_include``).
+
+``DevInventorySpec`` is imported but deliberately absent from ``__all__``:
+listing a re-exported class makes autodoc document it here as well as in
+:mod:`.spec`, and sphinx then finds two targets for every annotation. Importing
+it from this package keeps working either way.
 """
 
 from __future__ import annotations
@@ -43,7 +48,6 @@ from .planner import filter_plan_to_variants, plan_dev_inventory_matrix
 from .spec import DevInventorySpec, PlanEntry
 
 __all__ = [
-    "DevInventorySpec",
     "PlanEntry",
     "_bake_overrides",
     "_build_services_overrides_for_round",
diff --git a/cli/contributing/mirror/model.py b/cli/contributing/mirror/model.py
index 96400baade..36342a4672 100644
--- a/cli/contributing/mirror/model.py
+++ b/cli/contributing/mirror/model.py
@@ -1,5 +1,10 @@
+"""Local name for the image reference the mirror commands pass around.
+
+No ``__all__``: declaring the re-exported name makes autodoc document the
+class here as well as where it is defined, and sphinx then finds two targets
+for every ``ImageRef`` annotation.
+"""
+
 from __future__ import annotations
 
-from utils.docker.image.discovery import ImageRef
-
-__all__ = ["ImageRef"]
+from utils.docker.image.discovery import ImageRef  # noqa: F401