diff --git a/cue/private/tools/cue/BUILD.toolchains.bazel b/cue/private/tools/cue/BUILD.toolchains.bazel
index 8bdf327..109669c 100644
--- a/cue/private/tools/cue/BUILD.toolchains.bazel
+++ b/cue/private/tools/cue/BUILD.toolchains.bazel
@@ -4,6 +4,6 @@ load(
 )
 
 declare_bazel_toolchains(
-    toolchain_prefix = "@{tool_repo}//",
+    tool_repo_prefix = "@{tool_repo}",
     version = "{version}",
 )
diff --git a/cue/private/tools/cue/toolchain.bzl b/cue/private/tools/cue/toolchain.bzl
index eea0d46..879b4eb 100644
--- a/cue/private/tools/cue/toolchain.bzl
+++ b/cue/private/tools/cue/toolchain.bzl
@@ -197,7 +197,7 @@ _download_tool = repository_rule(
 )
 
 # buildifier: disable=unnamed-macro
-def declare_bazel_toolchains(version, toolchain_prefix):
+def declare_bazel_toolchains(version, tool_repo_prefix):
     native.constraint_value(
         name = version,
         constraint_setting = "{}:tool_version".format(_CONTAINING_PACKAGE_PREFIX),
@@ -210,7 +210,7 @@ def declare_bazel_toolchains(version, toolchain_prefix):
                 "{}:cpu_{}".format(constraint_value_prefix, platform.arch),
                 "{}:os_{}".format(constraint_value_prefix, platform.os),
             ],
-            toolchain = toolchain_prefix + (":{}_{}_{}".format(platform.os, platform.arch, version)),
+            toolchain = tool_repo_prefix + "-{os}-{arch}//:{os}_{arch}_{version}".format(arch = platform.arch, os = platform.os, version = version),
             toolchain_type = "@{}//tools/cue:toolchain_type".format(_MODULE_REPOSITORY_NAME),
         )
 
@@ -238,10 +238,17 @@ _toolchains_repo = repository_rule(
 )
 
 def download_tool(name, version = None):
-    _download_tool(
-        name = name,
-        version = version,
-    )
+    version = version or _DEFAULT_TOOL_VERSION
+    if version not in _TOOLS_BY_RELEASE:
+        fail("Unexpected version {} for cue tool. Available versions: {}".format(version, ", ".join(_TOOLS_BY_RELEASE.keys())))
+    for platform in _TOOLS_BY_RELEASE[version].keys():
+        repo_name = "{}-{}-{}".format(name, platform.os, platform.arch)
+        _download_tool(
+            name = repo_name,
+            arch = platform.arch,
+            os = platform.os,
+            version = version,
+        )
     _toolchains_repo(
         name = name + "_toolchains",
         tool_repo = name,