diff --git a/build/toolchain/toolchain-bundle/BUILD.bazel b/build/toolchain/toolchain-bundle/BUILD.bazel
index 06e2cb8..82437da 100644
--- a/build/toolchain/toolchain-bundle/BUILD.bazel
+++ b/build/toolchain/toolchain-bundle/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@rules_perl//perl:toolchain.bzl", "perl_toolchain")
-load(":toolchain.bzl", "TOOLCHAINS", "toolchain_for")
+load(":toolchain.bzl", "SUPPORTED_TARGETS", "TOOLCHAINS", "toolchain_for")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -11,36 +11,22 @@
     for name, config in TOOLCHAINS.items()
 ]
 
-perl_toolchain(
-    name = "rules_perl_linux_amd64_toolchain_impl",
-    runtime = [
-        "@toolchain-bundle-x86_64-unknown-linux-musl//:perl_runtime",
-    ],
-)
+# rules_perl wiring
 
-perl_toolchain(
-    name = "rules_perl_linux_aarch64_toolchain_impl",
-    runtime = [
-        "@toolchain-bundle-aarch64-unknown-linux-musl//:perl_runtime",
-    ],
-)
-
-toolchain(
-    name = "rules_perl_linux_amd64_toolchain",
-    exec_compatible_with = [
-        "@platforms//os:linux",
-        "@platforms//cpu:x86_64",
-    ],
-    toolchain = ":rules_perl_linux_amd64_toolchain_impl",
-    toolchain_type = "@rules_perl//perl:toolchain_type",
-)
-
-toolchain(
-    name = "rules_perl_linux_aarch64_toolchain",
-    exec_compatible_with = [
-        "@platforms//os:linux",
-        "@platforms//cpu:aarch64",
-    ],
-    toolchain = ":rules_perl_linux_aarch64_toolchain_impl",
-    toolchain_type = "@rules_perl//perl:toolchain_type",
-)
+[
+    [
+        perl_toolchain(
+            name = "rules_perl_%s_toolchain_impl" % target.tuple,
+            runtime = [
+                "@toolchain-bundle-%s//:perl_runtime" % target.triple,
+            ],
+        ),
+        toolchain(
+            name = "rules_perl_%s_toolchain" % target.tuple,
+            exec_compatible_with = target.constrain,
+            toolchain = ":rules_perl_%s_toolchain_impl" % target.tuple,
+            toolchain_type = "@rules_perl//perl:toolchain_type",
+        ),
+    ]
+    for target in SUPPORTED_TARGETS
+]