diff --git a/MODULE.bazel b/MODULE.bazel
index ac92c79f..d2de161e 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -17,9 +17,10 @@ use_repo(oci, "oci_crane_registry_toolchains", "oci_crane_toolchains")
 register_toolchains("@oci_crane_toolchains//:all", "@oci_crane_registry_toolchains//:all")
 
 # Dev dependencies
-bazel_lib = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "toolchains", dev_dependency = True)
+bazel_lib = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "toolchains")
 bazel_lib.jq()
-use_repo(bazel_lib, "jq_toolchains")
+bazel_lib.yq()
+use_repo(bazel_lib, "jq_toolchains", "yq_toolchains")
 
 bazel_dep(name = "rules_go", version = "0.46.0", dev_dependency = True, repo_name = "io_bazel_rules_go")
 bazel_dep(name = "rules_pkg", version = "0.7.0", dev_dependency = True)
diff --git a/oci/private/push.bzl b/oci/private/push.bzl
index d3eb727e..2ac91673 100644
--- a/oci/private/push.bzl
+++ b/oci/private/push.bzl
@@ -98,6 +98,23 @@ oci_push(
 ```
 """
 
+# Helper rule for ensuring that the crane and yq toolchains are actually
+# resolved for the architecture we are targeting.
+def _transition_to_target_impl(settings, attr):
+    return {
+        # String conversion is needed to prevent a crash with Bazel 6.x.
+        "//command_line_option:extra_execution_platforms": [
+            str(platform)
+            for platform in settings["//command_line_option:platforms"]
+        ],
+    }
+
+_transition_to_target = transition(
+    implementation = _transition_to_target_impl,
+    inputs = ["//command_line_option:platforms"],
+    outputs = ["//command_line_option:extra_execution_platforms"],
+)
+
 _attrs = {
     "image": attr.label(
         allow_single_file = True,
@@ -124,19 +141,30 @@ _attrs = {
         """,
         allow_single_file = [".txt"],
     ),
+    "_allowlist_function_transition": attr.label(
+        default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
+    ),
+    "_crane": attr.label(
+        cfg = _transition_to_target,
+        default = "@oci_crane_toolchains//:current_toolchain",
+    ),
     "_push_sh_tpl": attr.label(
         default = "push.sh.tpl",
         allow_single_file = True,
     ),
     "_windows_constraint": attr.label(default = "@platforms//os:windows"),
+    "_yq": attr.label(
+        cfg = _transition_to_target,
+        default = "@yq_toolchains//:resolved_toolchain",
+    ),
 }
 
 def _quote_args(args):
     return ["\"{}\"".format(arg) for arg in args]
 
 def _impl(ctx):
-    crane = ctx.toolchains["@rules_oci//oci:crane_toolchain_type"]
-    yq = ctx.toolchains["@aspect_bazel_lib//lib:yq_toolchain_type"]
+    crane = ctx.attr._crane[0][platform_common.ToolchainInfo]
+    yq = ctx.attr._yq[0][platform_common.ToolchainInfo]
 
     if ctx.attr.repository and ctx.attr.repository_file:
         fail("must specify exactly one of 'repository_file' or 'repository'")
@@ -184,11 +212,7 @@ def _impl(ctx):
 oci_push_lib = struct(
     implementation = _impl,
     attrs = _attrs,
-    toolchains = [
-        "@rules_oci//oci:crane_toolchain_type",
-        "@aspect_bazel_lib//lib:yq_toolchain_type",
-        "@bazel_tools//tools/sh:toolchain_type",
-    ],
+    toolchains = ["@bazel_tools//tools/sh:toolchain_type"],
 )
 
 oci_push = rule(