diff --git a/bazel_rules_fuchsia/fuchsia/private/assembly/fuchsia_product_image.bzl b/bazel_rules_fuchsia/fuchsia/private/assembly/fuchsia_product_image.bzl
index 55b8468..2e7e24f 100644
--- a/bazel_rules_fuchsia/fuchsia/private/assembly/fuchsia_product_image.bzl
+++ b/bazel_rules_fuchsia/fuchsia/private/assembly/fuchsia_product_image.bzl
@@ -45,7 +45,8 @@
 """
 
 def _fuchsia_product_image_impl(ctx):
-    ffx_tool = ctx.toolchains["@rules_fuchsia//fuchsia:toolchain"].ffx
+    fuchsia_toolchain = ctx.toolchains["@rules_fuchsia//fuchsia:toolchain"]
+    ffx_tool = fuchsia_toolchain.ffx
     legacy_aib = ctx.attr.legacy_aib[FuchsiaProductAssemblyBundleInfo]
     platform_aibs = ctx.attr.platform_aibs[FuchsiaProductAssemblyBundleInfo]
     out_dir = ctx.actions.declare_directory(ctx.label.name + "_out")
@@ -60,9 +61,13 @@
         board_config_arg = "--board-info $ORIG_DIR/$BOARD_CONFIG_PATH" if board_config_file else "",
     )
 
+    # NOTE: The `cmc` host tool is used by `ffx`, which finds its location
+    # by parsing the _sdk_manifest, then the `cmc_manifest` one.
     ffx_inputs = [
         ctx.file._sdk_manifest,
         ffx_tool,
+        fuchsia_toolchain.cmc,
+        fuchsia_toolchain.cmc_manifest,
         product_config_file,
     ]
     if board_config_file:
diff --git a/bazel_rules_fuchsia/fuchsia/workspace/fuchsia_toolchain_info.bzl b/bazel_rules_fuchsia/fuchsia/workspace/fuchsia_toolchain_info.bzl
index 9e56b7c..2c651b9 100644
--- a/bazel_rules_fuchsia/fuchsia/workspace/fuchsia_toolchain_info.bzl
+++ b/bazel_rules_fuchsia/fuchsia/workspace/fuchsia_toolchain_info.bzl
@@ -13,6 +13,7 @@
         blobfs = ctx.executable.blobfs,
         bindc = ctx.executable.bindc or None,
         cmc = ctx.executable.cmc,
+        cmc_manifest = ctx.files.cmc_manifest[0],
         cmc_includes = ctx.attr.cmc_includes or None,
         far = ctx.executable.far,
         ffx = ctx.executable.ffx,
@@ -68,6 +69,12 @@
             executable = True,
             allow_single_file = True,
         ),
+        "cmc_manifest": attr.label(
+            doc = "cmc tool executable SDK manifest, required by ffx.",
+            mandatory = True,
+            cfg = "exec",
+            allow_single_file = True,
+        ),
         "cmc_includes": attr.label(
             doc = "The collection of cml files to include in the cmc invocation",
             providers = [[FuchsiaComponentManifestShardCollectionInfo]],
diff --git a/bazel_rules_fuchsia/fuchsia/workspace/sdk_templates/repository_template.BUILD b/bazel_rules_fuchsia/fuchsia/workspace/sdk_templates/repository_template.BUILD
index dd3986f..260a94c 100644
--- a/bazel_rules_fuchsia/fuchsia/workspace/sdk_templates/repository_template.BUILD
+++ b/bazel_rules_fuchsia/fuchsia/workspace/sdk_templates/repository_template.BUILD
@@ -84,6 +84,7 @@
     blobfs = "//tools:x64/blobfs_do_not_depend",
     bootserver = "//tools:x64/bootserver",
     cmc = "//tools:x64/cmc",
+    cmc_manifest = "//tools:x64/cmc-meta.json",
     cmc_includes = select({
         "@platforms//os:fuchsia": "//:cmc_includes",
         "//conditions:default": None,