diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 30c1f22b0..446efb6b4 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -1,6 +1,6 @@
 ---
 validate_config: 1
-bazel: 6.1.1
+bazel: 6.3.2
 buildifier:
   version: 6.1.0
   # no lint warnings for the moment. They are basically a smoke alarm in hell.
@@ -12,6 +12,9 @@ tasks:
       - "//:all_tests"
     build_targets:
       - "//:rules_kotlin_release"
+  macos:
+    test_targets:
+      - "//:all_tests"
   rbe_ubuntu1604:
     test_targets:
       - "--"
@@ -24,9 +27,6 @@ tasks:
       # Override the default worker strategy for remote builds (worker strategy
       # cannot be used with remote builds)
       - "--strategy=KotlinCompile=remote"
-  macos:
-    test_targets:
-      - "//:all_tests"
   example-android:
     name: "Example - Android"
     platform: ubuntu1804
diff --git a/.bazelversion b/.bazelversion
index f3b5af39e..91e4a9f26 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-6.1.1
+6.3.2
diff --git a/README.md b/README.md
index 81fc089a1..b9cce1123 100644
--- a/README.md
+++ b/README.md
@@ -320,7 +320,7 @@ kt_compiler_plugin(
         "annotation": "plugin.allopen.OpenForTesting",
     },
     deps = [
-        "@com_github_jetbrains_kotlin//:allopen-compiler-plugin",
+        "//kotlin/compiler:allopen-compiler-plugin",
     ],
 )
 
diff --git a/docs/kotlin.md b/docs/kotlin.md
index 534ac1c61..26720f7a1 100755
--- a/docs/kotlin.md
+++ b/docs/kotlin.md
@@ -211,7 +211,7 @@ kt_jvm_test(<a href="#kt_jvm_test-name">name</a>, <a href="#kt_jvm_test-associat
         
         **Notes:**
         * The kotlin test library is not added implicitly, it is available with the label
-        `@com_github_jetbrains_kotlin//:kotlin-test`.
+        `@io_bazel_rules_kotlin//kotlin/compiler:kotlin-test`.
     
 
 **ATTRIBUTES**
@@ -330,7 +330,7 @@ kt_compiler_plugin(<a href="#kt_compiler_plugin-name">name</a>, <a href="#kt_com
                 "annotation": "plugin.OpenForTesting",
             },
             deps = [
-                "@com_github_jetbrains_kotlin//:allopen-compiler-plugin",
+                "//kotlin/compiler:allopen-compiler-plugin",
             ],
         )
         
diff --git a/examples/android/WORKSPACE b/examples/android/WORKSPACE
index fa8c4f0c1..ab1bc65b9 100644
--- a/examples/android/WORKSPACE
+++ b/examples/android/WORKSPACE
@@ -33,7 +33,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")
diff --git a/examples/android/bzl/BUILD.bazel b/examples/android/bzl/BUILD.bazel
index dc16bfa70..116da98d2 100644
--- a/examples/android/bzl/BUILD.bazel
+++ b/examples/android/bzl/BUILD.bazel
@@ -12,10 +12,6 @@ kt_javac_options(
 define_kt_toolchain(
     name = "experimental_toolchain",
     api_version = "1.5",
-    # TODO(630): enable when the reduced classpath can correctly manage transitive maven dependencies.
-    # experimental_reduce_classpath_mode = "KOTLINBUILDER_REDUCED",
-    experimental_report_unused_deps = "warn",
-    experimental_strict_kotlin_deps = "warn",
     experimental_use_abi_jars = True,
     javac_options = ":default_javac_options",
     kotlinc_options = ":default_kotlinc_options",
diff --git a/examples/android/libKtAndroid/BUILD.bazel b/examples/android/libKtAndroid/BUILD.bazel
index c8eb3affb..a75d9a82a 100644
--- a/examples/android/libKtAndroid/BUILD.bazel
+++ b/examples/android/libKtAndroid/BUILD.bazel
@@ -8,7 +8,7 @@ kt_compiler_plugin(
     id = "org.jetbrains.kotlin.serialization",
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:kotlinx-serialization-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:kotlinx-serialization-compiler-plugin",
     ],
 )
 
diff --git a/examples/anvil/WORKSPACE b/examples/anvil/WORKSPACE
index d1a1b25e0..1d668ae03 100644
--- a/examples/anvil/WORKSPACE
+++ b/examples/anvil/WORKSPACE
@@ -51,7 +51,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")
diff --git a/examples/associates/WORKSPACE b/examples/associates/WORKSPACE
index a08b43dbf..2c83af27f 100644
--- a/examples/associates/WORKSPACE
+++ b/examples/associates/WORKSPACE
@@ -39,7 +39,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")
diff --git a/examples/dagger/WORKSPACE b/examples/dagger/WORKSPACE
index 356538adf..9339a888a 100644
--- a/examples/dagger/WORKSPACE
+++ b/examples/dagger/WORKSPACE
@@ -21,7 +21,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")
diff --git a/examples/deps/WORKSPACE b/examples/deps/WORKSPACE
index 93e896db2..17030a273 100644
--- a/examples/deps/WORKSPACE
+++ b/examples/deps/WORKSPACE
@@ -31,7 +31,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")
diff --git a/examples/jetpack_compose/WORKSPACE b/examples/jetpack_compose/WORKSPACE
index 0bcb0dbab..278c312a2 100644
--- a/examples/jetpack_compose/WORKSPACE
+++ b/examples/jetpack_compose/WORKSPACE
@@ -38,7 +38,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")
diff --git a/examples/ksp/WORKSPACE b/examples/ksp/WORKSPACE
index 44a8fb20b..078721755 100644
--- a/examples/ksp/WORKSPACE
+++ b/examples/ksp/WORKSPACE
@@ -32,7 +32,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")
diff --git a/examples/node/WORKSPACE b/examples/node/WORKSPACE
index 606684823..57cc23a99 100644
--- a/examples/node/WORKSPACE
+++ b/examples/node/WORKSPACE
@@ -25,7 +25,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 http_archive(
diff --git a/examples/plugin/WORKSPACE b/examples/plugin/WORKSPACE
index 6d523a040..8dc608912 100644
--- a/examples/plugin/WORKSPACE
+++ b/examples/plugin/WORKSPACE
@@ -23,7 +23,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")
diff --git a/examples/plugin/src/allopen/BUILD b/examples/plugin/src/allopen/BUILD
index 39f10f566..df40efe5d 100644
--- a/examples/plugin/src/allopen/BUILD
+++ b/examples/plugin/src/allopen/BUILD
@@ -10,7 +10,7 @@ kt_compiler_plugin(
     },
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:allopen-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:allopen-compiler-plugin",
     ],
 )
 
diff --git a/examples/plugin/src/allopennoarg/BUILD b/examples/plugin/src/allopennoarg/BUILD
index be7f31afb..3f89c1ef0 100644
--- a/examples/plugin/src/allopennoarg/BUILD
+++ b/examples/plugin/src/allopennoarg/BUILD
@@ -10,7 +10,7 @@ kt_compiler_plugin(
     },
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:allopen-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:allopen-compiler-plugin",
     ],
 )
 
@@ -23,7 +23,7 @@ kt_compiler_plugin(
     },
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:noarg-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:noarg-compiler-plugin",
     ],
 )
 
@@ -64,7 +64,7 @@ kt_jvm_test(
     test_class = "plugin.allopennoarg.UserHasNoargConstructorTest",
     deps = [
         ":user",
-        "@com_github_jetbrains_kotlin//:kotlin-reflect",
+        "@io_bazel_rules_kotlin//kotlin/compiler:kotlin-reflect",
         "@maven//:junit_junit",
     ],
 )
diff --git a/examples/plugin/src/noarg/BUILD b/examples/plugin/src/noarg/BUILD
index 4d786ebc2..1e57e693a 100644
--- a/examples/plugin/src/noarg/BUILD
+++ b/examples/plugin/src/noarg/BUILD
@@ -10,7 +10,7 @@ kt_compiler_plugin(
     },
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:noarg-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:noarg-compiler-plugin",
     ],
 )
 
@@ -35,7 +35,7 @@ kt_jvm_test(
     test_class = "plugin.noarg.UserHasNoargConstructorTest",
     deps = [
         ":user",
-        "@com_github_jetbrains_kotlin//:kotlin-reflect",
+        "@io_bazel_rules_kotlin//kotlin/compiler:kotlin-reflect",
         "@maven//:junit_junit",
     ],
 )
diff --git a/examples/plugin/src/parcelize/BUILD b/examples/plugin/src/parcelize/BUILD
index e0ac8be71..945388777 100644
--- a/examples/plugin/src/parcelize/BUILD
+++ b/examples/plugin/src/parcelize/BUILD
@@ -8,7 +8,7 @@ kt_compiler_plugin(
     id = "org.jetbrains.kotlin.parcelize",
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:parcelize-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:parcelize-compiler-plugin",
     ],
 )
 
@@ -21,7 +21,7 @@ kt_jvm_library(
     ],
     visibility = ["//visibility:public"],
     exports = [
-        "@com_github_jetbrains_kotlin//:parcelize-runtime",
+        "@io_bazel_rules_kotlin//kotlin/compiler:parcelize-runtime",
     ],
 )
 
diff --git a/examples/plugin/src/sam_with_receiver/BUILD b/examples/plugin/src/sam_with_receiver/BUILD
index 33e518485..a2d4a43f7 100644
--- a/examples/plugin/src/sam_with_receiver/BUILD
+++ b/examples/plugin/src/sam_with_receiver/BUILD
@@ -11,7 +11,7 @@ kt_compiler_plugin(
     },
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:sam-with-receiver-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:sam-with-receiver-compiler-plugin",
     ],
 )
 
diff --git a/examples/plugin/src/serialization/BUILD b/examples/plugin/src/serialization/BUILD
index 3943085a6..1d8b7a5cb 100644
--- a/examples/plugin/src/serialization/BUILD
+++ b/examples/plugin/src/serialization/BUILD
@@ -7,7 +7,7 @@ kt_compiler_plugin(
     id = "org.jetbrains.kotlin.serialization",
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:kotlinx-serialization-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:kotlinx-serialization-compiler-plugin",
     ],
 )
 
diff --git a/examples/trivial/WORKSPACE b/examples/trivial/WORKSPACE
index 90eb8a48f..75435ae87 100644
--- a/examples/trivial/WORKSPACE
+++ b/examples/trivial/WORKSPACE
@@ -23,7 +23,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")
diff --git a/kotlin/BUILD b/kotlin/BUILD
index e5919ea1b..8ef4e35c4 100644
--- a/kotlin/BUILD
+++ b/kotlin/BUILD
@@ -28,6 +28,7 @@ release_archive(
         "BUILD.release.bazel": "BUILD.bazel",
     },
     deps = [
+        "//kotlin/compiler:pkg",
         "//kotlin/internal:pkg",
         "//kotlin/settings:pkg",
     ],
diff --git a/kotlin/compiler/BUILD b/kotlin/compiler/BUILD
new file mode 100644
index 000000000..2afe7199a
--- /dev/null
+++ b/kotlin/compiler/BUILD
@@ -0,0 +1,32 @@
+# Copyright 2020 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+load(":compiler.bzl", "kt_configure_compiler")
+load(":ksp.bzl", "kt_configure_ksp")
+load("//src/main/starlark/release:packager.bzl", "release_archive")
+
+package(default_visibility = ["//visibility:public"])
+
+# Configures the compiler
+kt_configure_compiler()
+
+# Configures the KSP plugins
+kt_configure_ksp()
+
+release_archive(
+    name = "pkg",
+    srcs = glob(["*.bzl"]),
+    src_map = {
+        "BUILD.release.bazel": "BUILD.bazel",
+    },
+)
diff --git a/kotlin/compiler/BUILD.release.bazel b/kotlin/compiler/BUILD.release.bazel
new file mode 100644
index 000000000..a512a021c
--- /dev/null
+++ b/kotlin/compiler/BUILD.release.bazel
@@ -0,0 +1,23 @@
+# Copyright 2020 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+load(":compiler.bzl", "kt_configure_compiler")
+load(":ksp.bzl", "kt_configure_ksp")
+
+package(default_visibility = ["//visibility:public"])
+
+# Configures the compiler
+kt_configure_compiler()
+
+# Configures the KSP plugins
+kt_configure_ksp()
diff --git a/kotlin/compiler/compiler.bzl b/kotlin/compiler/compiler.bzl
new file mode 100644
index 000000000..128d0aad7
--- /dev/null
+++ b/kotlin/compiler/compiler.bzl
@@ -0,0 +1,127 @@
+# Copyright 2022 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+load("//kotlin:jvm.bzl", "kt_jvm_import")
+load("//kotlin:js.bzl", "kt_js_import")
+load("@rules_java//java:defs.bzl", "java_import")
+load("//kotlin/internal:defs.bzl", _KT_COMPILER_REPO = "KT_COMPILER_REPO")
+
+_KT_COMPILER_REPO_PREFIX = "@" + _KT_COMPILER_REPO + "//:"
+
+def kt_configure_compiler():
+    """
+    Defines the toolchain_type and default toolchain for kotlin compilation.
+
+    Must be called in kotlin/internal/BUILD.bazel
+    """
+    if native.package_name() != "kotlin/compiler":
+        fail("kt_configure_compiler must be called in kotlin/compiler not %s" % native.package_name())
+
+    kt_jvm_import(
+        name = "annotations",
+        jar = _KT_COMPILER_REPO_PREFIX + "lib/annotations-13.0.jar",
+        neverlink = 1,
+    )
+
+    kt_jvm_import(
+        name = "jvm-abi-gen",
+        jar = _KT_COMPILER_REPO_PREFIX + "lib/jvm-abi-gen.jar",
+    )
+
+    # Kotlin dependencies that are internal to this repo and are meant to be loaded manually into a classloader.
+    [
+        kt_jvm_import(
+            name = "kotlin-%s" % art,
+            jar = _KT_COMPILER_REPO_PREFIX + "lib/kotlin-%s.jar" % art,
+            neverlink = 1,
+        )
+        for art in [
+            "annotation-processing",
+            "annotation-processing-runtime",
+            "compiler",
+        ]
+    ]
+
+    kt_jvm_import(
+        name = "kotlinx-serialization-compiler-plugin",
+        jar = _KT_COMPILER_REPO_PREFIX + "lib/kotlinx-serialization-compiler-plugin.jar",
+    )
+
+    kt_jvm_import(
+        name = "allopen-compiler-plugin",
+        jar = _KT_COMPILER_REPO_PREFIX + "lib/allopen-compiler-plugin.jar",
+    )
+
+    kt_jvm_import(
+        name = "noarg-compiler-plugin",
+        jar = _KT_COMPILER_REPO_PREFIX + "lib/noarg-compiler-plugin.jar",
+    )
+
+    kt_jvm_import(
+        name = "sam-with-receiver-compiler-plugin",
+        jar = _KT_COMPILER_REPO_PREFIX + "lib/sam-with-receiver-compiler-plugin.jar",
+    )
+
+    kt_jvm_import(
+        name = "parcelize-compiler-plugin",
+        jar = _KT_COMPILER_REPO_PREFIX + "lib/parcelize-compiler.jar",
+    )
+
+    kt_jvm_import(
+        name = "parcelize-runtime",
+        jar = _KT_COMPILER_REPO_PREFIX + "lib/parcelize-runtime.jar",
+    )
+
+    # Kotlin dependencies that are internal to this repo and may be linked.
+    [
+        java_import(
+            name = "kotlin-%s" % art,
+            jars = [_KT_COMPILER_REPO_PREFIX + "lib/kotlin-%s.jar" % art],
+        )
+        for art in [
+            "preloader",
+        ]
+    ]
+
+    #  The Kotlin standard libraries. These should be setup in a Toolchain.
+    [
+        kt_jvm_import(
+            name = "kotlin-%s" % art,
+            jar = _KT_COMPILER_REPO_PREFIX + "lib/kotlin-%s.jar" % art,
+            srcjar = _KT_COMPILER_REPO_PREFIX + "lib/kotlin-%s-sources.jar" % art,
+            visibility = ["//visibility:public"],
+        )
+        for art in [
+            "stdlib",
+            "stdlib-jdk7",
+            "stdlib-jdk8",
+            "reflect",
+            "test",
+            "script-runtime",
+        ]
+    ]
+
+    #  The Kotlin JS standard libraries. These should be setup in a Toolchain.
+    [
+        kt_js_import(
+            name = "kotlin-%s" % art,
+            jars = [_KT_COMPILER_REPO_PREFIX + "lib/kotlin-%s.jar" % art],
+            srcjar = _KT_COMPILER_REPO_PREFIX + "lib/kotlin-%s-sources.jar" % art,
+            visibility = ["//visibility:public"],
+        )
+        for art in [
+            "test-js",
+            "stdlib-js",
+        ]
+    ]
diff --git a/kotlin/compiler/ksp.bzl b/kotlin/compiler/ksp.bzl
new file mode 100644
index 000000000..483741ecf
--- /dev/null
+++ b/kotlin/compiler/ksp.bzl
@@ -0,0 +1,42 @@
+# Copyright 2022 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+load("//kotlin:jvm.bzl", "kt_jvm_import")
+load("//kotlin/internal:defs.bzl", _KSP_COMPILER_PLUGIN_REPO = "KSP_COMPILER_PLUGIN_REPO")
+
+_KSP_COMPILER_PLUGIN_REPO_PREFIX = "@" + _KSP_COMPILER_PLUGIN_REPO + "//:"
+
+def kt_configure_ksp():
+    """
+    Defines the toolchain_type and default toolchain for KSP plugins.
+
+    Must be called in kotlin/internal/BUILD.bazel
+    """
+    if native.package_name() != "kotlin/compiler":
+        fail("kt_configure_ksp must be called in kotlin/compiler not %s" % native.package_name())
+
+    kt_jvm_import(
+        name = "symbol-processing",
+        jar = _KSP_COMPILER_PLUGIN_REPO_PREFIX + "symbol-processing.jar",
+    )
+
+    kt_jvm_import(
+        name = "symbol-processing-api",
+        jar = _KSP_COMPILER_PLUGIN_REPO_PREFIX + "symbol-processing-api.jar",
+    )
+
+    kt_jvm_import(
+        name = "symbol-processing-cmdline",
+        jar = _KSP_COMPILER_PLUGIN_REPO_PREFIX + "symbol-processing-cmdline.jar",
+    )
diff --git a/kotlin/internal/js/js.bzl b/kotlin/internal/js/js.bzl
index b6f69edd2..7a360d5f4 100644
--- a/kotlin/internal/js/js.bzl
+++ b/kotlin/internal/js/js.bzl
@@ -89,7 +89,7 @@ kt_js_library = rule(
         ),
         "_toolchain": attr.label(
             doc = """The Kotlin JS Runtime.""",
-            default = Label("@" + _KT_COMPILER_REPO + "//:kotlin-stdlib-js"),
+            default = Label("//kotlin/compiler:kotlin-stdlib-js"),
             cfg = "target",
         ),
     },
@@ -108,7 +108,7 @@ def kt_js_library_macro(name, **kwargs):
     kwargs = _lock_attrs(name, kwargs)
 
     # TODO this is a runtime dep, it should be picked up from the _toolchain attr or from a provider.
-    kwargs["deps"] = kwargs.get("deps", []) + ["@" + _KT_COMPILER_REPO + "//:kotlin-stdlib-js"]
+    kwargs["deps"] = kwargs.get("deps", []) + ["@io_bazel_rules_kotlin//kotlin/compiler:kotlin-stdlib-js"]
     kt_js_library(name = name, **kwargs)
 
 kt_js_import = rule(
diff --git a/kotlin/internal/jvm/compile.bzl b/kotlin/internal/jvm/compile.bzl
index 98a32cb1e..4f8539b47 100644
--- a/kotlin/internal/jvm/compile.bzl
+++ b/kotlin/internal/jvm/compile.bzl
@@ -272,7 +272,7 @@ def _run_merge_jdeps_action(ctx, toolchains, jdeps, outputs, deps):
     )
 
     # For sandboxing to work, and for this action to be deterministic, the compile jars need to be passed as inputs
-    inputs = depset(jdeps, transitive = [depset([], transitive = [dep.transitive_deps for dep in deps])])
+    inputs = depset(jdeps, transitive = [depset([], transitive = [dep.transitive_compile_time_jars for dep in deps])])
 
     ctx.actions.run(
         mnemonic = mnemonic,
@@ -549,7 +549,8 @@ def kt_jvm_produce_jar_actions(ctx, rule_kind):
         rule_kind = rule_kind,
         toolchains = toolchains,
         srcs = srcs,
-        generated_src_jars = [],
+        generated_kapt_src_jars = [],
+        generated_ksp_src_jars = [],
         associates = associates,
         compile_deps = compile_deps,
         deps_artifacts = deps_artifacts,
@@ -638,7 +639,8 @@ def _run_kt_java_builder_actions(
         rule_kind,
         toolchains,
         srcs,
-        generated_src_jars,
+        generated_kapt_src_jars,
+        generated_ksp_src_jars,
         associates,
         compile_deps,
         deps_artifacts,
@@ -672,7 +674,7 @@ def _run_kt_java_builder_actions(
             transitive_runtime_jars = transitive_runtime_jars,
             plugins = plugins,
         )
-        generated_src_jars.append(kapt_outputs.ap_generated_src_jar)
+        generated_kapt_src_jars.append(kapt_outputs.ap_generated_src_jar)
         output_jars.append(kapt_outputs.kapt_generated_class_jar)
         kt_stubs_for_java.append(
             JavaInfo(
@@ -696,7 +698,7 @@ def _run_kt_java_builder_actions(
             transitive_runtime_jars = transitive_runtime_jars,
             plugins = plugins,
         )
-        generated_src_jars.append(ksp_outputs.ksp_generated_class_jar)
+        generated_ksp_src_jars.append(ksp_outputs.ksp_generated_class_jar)
 
     java_infos = []
 
@@ -725,7 +727,7 @@ def _run_kt_java_builder_actions(
             rule_kind = rule_kind,
             toolchains = toolchains,
             srcs = srcs,
-            generated_src_jars = generated_src_jars,
+            generated_src_jars = generated_kapt_src_jars + generated_ksp_src_jars,
             associates = associates,
             compile_deps = compile_deps,
             deps_artifacts = deps_artifacts,
@@ -756,7 +758,7 @@ def _run_kt_java_builder_actions(
     # Build Java
     # If there is Java source or KAPT generated Java source compile that Java and fold it into
     # the final ABI jar. Otherwise just use the KT ABI jar as final ABI jar.
-    if srcs.java or generated_src_jars or srcs.src_jars:
+    if srcs.java or generated_kapt_src_jars or srcs.src_jars:
         javac_opts = javac_options_to_flags(toolchains.kt.javac_options)
 
         # Kotlin takes care of annotation processing. Note that JavaBuilder "discovers"
@@ -766,7 +768,7 @@ def _run_kt_java_builder_actions(
         java_info = java_common.compile(
             ctx,
             source_files = srcs.java,
-            source_jars = generated_src_jars + srcs.src_jars,
+            source_jars = generated_kapt_src_jars + srcs.src_jars,
             output = ctx.actions.declare_file(ctx.label.name + "-java.jar"),
             deps = compile_deps.deps + kt_stubs_for_java,
             java_toolchain = toolchains.java,
@@ -827,7 +829,7 @@ def _run_kt_java_builder_actions(
 
     return struct(
         output_jars = output_jars,
-        generated_src_jars = generated_src_jars,
+        generated_src_jars = generated_kapt_src_jars + generated_ksp_src_jars,
         annotation_processing = annotation_processing,
     )
 
diff --git a/kotlin/internal/jvm/jvm.bzl b/kotlin/internal/jvm/jvm.bzl
index 61fcb0ecc..a50536197 100644
--- a/kotlin/internal/jvm/jvm.bzl
+++ b/kotlin/internal/jvm/jvm.bzl
@@ -46,7 +46,7 @@ the repository the following Kotlin Libraries are also made available from the w
 * `kotlin-test`,
 * `kotlin-reflect`.
 
-So if you needed to add reflect as a dep use the following label `@com_github_jetbrains_kotlin//:kotlin-reflect`.
+So if you needed to add reflect as a dep use the following label `//kotlin/compiler:kotlin-reflect`.
 
 ### Mixed Mode compilation
 
@@ -96,7 +96,6 @@ load(
     "//kotlin/internal:defs.bzl",
     _JAVA_RUNTIME_TOOLCHAIN_TYPE = "JAVA_RUNTIME_TOOLCHAIN_TYPE",
     _JAVA_TOOLCHAIN_TYPE = "JAVA_TOOLCHAIN_TYPE",
-    _KT_COMPILER_REPO = "KT_COMPILER_REPO",
     _KspPluginInfo = "KspPluginInfo",
     _KtCompilerPluginInfo = "KtCompilerPluginInfo",
     _KtJvmInfo = "KtJvmInfo",
@@ -139,7 +138,7 @@ _implicit_deps = {
     "_toolchain": attr.label(
         doc = """The Kotlin JVM Runtime. it's only purpose is to enable the Android native rules to discover the Kotlin
         runtime for dexing""",
-        default = Label("@" + _KT_COMPILER_REPO + "//:kotlin-stdlib"),
+        default = Label("//kotlin/compiler:kotlin-stdlib"),
         cfg = "target",
     ),
     "_java_toolchain": attr.label(
@@ -149,6 +148,9 @@ _implicit_deps = {
         default = Label("@bazel_tools//tools/jdk:current_java_runtime"),
         cfg = "exec",
     ),
+}
+
+_runnable_implicit_deps = {
     "_java_runtime": attr.label(
         default = Label("@bazel_tools//tools/jdk:current_java_runtime"),
     ),
@@ -269,7 +271,7 @@ this is not transitive""",
     ),
 })
 
-_runnable_common_attr = utils.add_dicts(_common_attr, {
+_runnable_common_attr = utils.add_dicts(_common_attr, _runnable_implicit_deps, {
     "jvm_flags": attr.string_list(
         doc = """A list of flags to embed in the wrapper script generated for running this binary. Note: does not yet
         support make variable substitution.""",
@@ -287,6 +289,9 @@ _common_outputs = dict(
 _common_toolchains = [
     _TOOLCHAIN_TYPE,
     _JAVA_TOOLCHAIN_TYPE,
+]
+
+_runnable_common_toolchains = [
     _JAVA_RUNTIME_TOOLCHAIN_TYPE,
 ]
 
@@ -318,7 +323,7 @@ It is appropriate for building workspace utilities. `java_binary` should be pref
     }.items()),
     executable = True,
     outputs = _common_outputs,
-    toolchains = _common_toolchains,
+    toolchains = _common_toolchains + _runnable_common_toolchains,
     fragments = ["java"],  # Required fragments of the target configuration
     host_fragments = ["java"],  # Required fragments of the host configuration
     implementation = _kt_jvm_binary_impl,
@@ -330,7 +335,7 @@ Setup a simple kotlin_test.
 
 **Notes:**
 * The kotlin test library is not added implicitly, it is available with the label
-`@com_github_jetbrains_kotlin//:kotlin-test`.
+`@io_bazel_rules_kotlin//kotlin/compiler:kotlin-test`.
 """,
     attrs = utils.add_dicts(_runnable_common_attr, {
         "_bazel_test_runner": attr.label(
@@ -353,7 +358,7 @@ Setup a simple kotlin_test.
     executable = True,
     outputs = _common_outputs,
     test = True,
-    toolchains = _common_toolchains,
+    toolchains = _common_toolchains + _runnable_common_toolchains,
     implementation = _kt_jvm_junit_test_impl,
     fragments = ["java"],  # Required fragments of the target configuration
     host_fragments = ["java"],  # Required fragments of the host configuration
@@ -487,7 +492,7 @@ kt_compiler_plugin(
         "annotation": "plugin.OpenForTesting",
     },
     deps = [
-        "@com_github_jetbrains_kotlin//:allopen-compiler-plugin",
+        "//kotlin/compiler:allopen-compiler-plugin",
     ],
 )
 
diff --git a/kotlin/internal/toolchains.bzl b/kotlin/internal/toolchains.bzl
index b9ab122e4..9924b5b2d 100644
--- a/kotlin/internal/toolchains.bzl
+++ b/kotlin/internal/toolchains.bzl
@@ -158,7 +158,7 @@ _kt_toolchain = rule(
         "jvm_runtime": attr.label_list(
             doc = "The implicit jvm runtime libraries. This is internal.",
             default = [
-                Label("@" + _KT_COMPILER_REPO + "//:kotlin-stdlib"),
+                Label("//kotlin/compiler:kotlin-stdlib"),
             ],
             providers = [JavaInfo],
             cfg = "target",
@@ -166,12 +166,12 @@ _kt_toolchain = rule(
         "jvm_stdlibs": attr.label_list(
             doc = "The jvm stdlibs. This is internal.",
             default = [
-                Label("@" + _KT_COMPILER_REPO + "//:annotations"),
-                Label("@" + _KT_COMPILER_REPO + "//:kotlin-stdlib"),
-                Label("@" + _KT_COMPILER_REPO + "//:kotlin-stdlib-jdk7"),
+                Label("//kotlin/compiler:annotations"),
+                Label("//kotlin/compiler:kotlin-stdlib"),
+                Label("//kotlin/compiler:kotlin-stdlib-jdk7"),
                 # JDK8 is being added blindly but I think we will probably not support bytecode levels 1.6 when the
                 # repo stabelizes so this should be fine.
-                Label("@" + _KT_COMPILER_REPO + "//:kotlin-stdlib-jdk8"),
+                Label("//kotlin/compiler:kotlin-stdlib-jdk8"),
             ],
             providers = [JavaInfo],
             cfg = "target",
@@ -198,7 +198,7 @@ _kt_toolchain = rule(
         ),
         "js_stdlibs": attr.label_list(
             default = [
-                Label("@" + _KT_COMPILER_REPO + "//:kotlin-stdlib-js"),
+                Label("//kotlin/compiler:kotlin-stdlib-js"),
             ],
             providers = [_KtJsInfo],
         ),
diff --git a/src/main/kotlin/BUILD.release.bazel b/src/main/kotlin/BUILD.release.bazel
index 7e2d6d119..37272bdc6 100644
--- a/src/main/kotlin/BUILD.release.bazel
+++ b/src/main/kotlin/BUILD.release.bazel
@@ -39,22 +39,23 @@ java_binary(
     data = [
         ":jdeps-gen",
         ":skip-code-gen",
+        "//kotlin/compiler:jvm-abi-gen",
+        "//kotlin/compiler:kotlin-annotation-processing",
+        "//kotlin/compiler:kotlin-compiler",
+        "//kotlin/compiler:symbol-processing-api",
+        "//kotlin/compiler:symbol-processing-cmdline",
         "//src/main/kotlin/io/bazel/kotlin/compiler",
-        "@com_github_google_ksp//:symbol-processing-api",
-        "@com_github_google_ksp//:symbol-processing-cmdline",
-        "@com_github_jetbrains_kotlin//:jvm-abi-gen",
-        "@com_github_jetbrains_kotlin//:kotlin-annotation-processing",
-        "@com_github_jetbrains_kotlin//:kotlin-compiler",
+        "@com_github_jetbrains_kotlin//:home",
     ],
     jvm_flags = [
-        "-D@com_github_jetbrains_kotlin...jvm-abi-gen=$(rlocationpath @com_github_jetbrains_kotlin//:jvm-abi-gen)",
-        "-D@com_github_jetbrains_kotlin...kotlin-compiler=$(rlocationpath @com_github_jetbrains_kotlin//:kotlin-compiler)",
-        "-D@com_github_jetbrains_kotlin...kapt=$(rlocationpath @com_github_jetbrains_kotlin//:kotlin-annotation-processing)",
+        "-D@com_github_jetbrains_kotlin...jvm-abi-gen=$(rlocationpath //kotlin/compiler:jvm-abi-gen)",
+        "-D@com_github_jetbrains_kotlin...kotlin-compiler=$(rlocationpath //kotlin/compiler:kotlin-compiler)",
+        "-D@com_github_jetbrains_kotlin...kapt=$(rlocationpath //kotlin/compiler:kotlin-annotation-processing)",
         "-D@rules_kotlin...jdeps-gen=$(rlocationpath //src/main/kotlin:jdeps-gen)",
         "-D@rules_kotlin...skip-code-gen=$(rlocationpath //src/main/kotlin:skip-code-gen)",
         "-D@rules_kotlin...compiler=$(rlocationpath //src/main/kotlin/io/bazel/kotlin/compiler)",
-        "-D@com_github_google_ksp...symbol-processing-api=$(rlocationpath @com_github_google_ksp//:symbol-processing-api)",
-        "-D@com_github_google_ksp...symbol-processing-cmdline=$(rlocationpath @com_github_google_ksp//:symbol-processing-cmdline)",
+        "-D@com_github_google_ksp...symbol-processing-api=$(rlocationpath //kotlin/compiler:symbol-processing-api)",
+        "-D@com_github_google_ksp...symbol-processing-cmdline=$(rlocationpath //kotlin/compiler:symbol-processing-cmdline)",
         "-XX:-MaxFDLimit",
     ],
     main_class = "io.bazel.kotlin.builder.cmd.Build",
diff --git a/src/main/kotlin/bootstrap.bzl b/src/main/kotlin/bootstrap.bzl
index db7728d84..9b2c9ce97 100644
--- a/src/main/kotlin/bootstrap.bzl
+++ b/src/main/kotlin/bootstrap.bzl
@@ -64,8 +64,8 @@ CP="%s"
 ARGS="%s"
 
 CMD="$(JAVA) -Xmx256M -Xms32M -noverify \
-      -cp $(location @com_github_jetbrains_kotlin//:kotlin-preloader) org.jetbrains.kotlin.preloading.Preloader \
-      -cp $(location @com_github_jetbrains_kotlin//:kotlin-compiler) org.jetbrains.kotlin.cli.jvm.K2JVMCompiler \
+      -cp $(location //kotlin/compiler:kotlin-preloader) org.jetbrains.kotlin.preloading.Preloader \
+      -cp $(location //kotlin/compiler:kotlin-compiler) org.jetbrains.kotlin.cli.jvm.K2JVMCompiler \
       $$CP -d $(@D)/$${NAME}_temp.jar $${ARGS} $(SRCS)"
 
 $$CMD
@@ -91,8 +91,8 @@ rm $(@D)/$${NAME}_temp.jar
         name = jar_label,
         tools = [
             "@com_github_jetbrains_kotlin//:home",
-            "@com_github_jetbrains_kotlin//:kotlin-preloader",
-            "@com_github_jetbrains_kotlin//:kotlin-compiler",
+            "//kotlin/compiler:kotlin-preloader",
+            "//kotlin/compiler:kotlin-compiler",
             "@bazel_tools//tools/jdk:singlejar",
             dep_label,
         ],
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/BUILD b/src/main/kotlin/io/bazel/kotlin/builder/BUILD
index 54966de81..565f2f297 100644
--- a/src/main/kotlin/io/bazel/kotlin/builder/BUILD
+++ b/src/main/kotlin/io/bazel/kotlin/builder/BUILD
@@ -18,10 +18,12 @@ java_library(
     srcs = glob(["*.java"]),
     visibility = ["//src:__subpackages__"],
     runtime_deps = [
-        "@com_github_jetbrains_kotlin//:kotlin-stdlib-jdk7",
-        "@com_github_jetbrains_kotlin//:kotlin-stdlib-jdk8",
+        "//kotlin/compiler:kotlin-stdlib-jdk7",
+        "//kotlin/compiler:kotlin-stdlib-jdk8",
     ],
     deps = [
+        "//kotlin/compiler:annotations",
+        "//kotlin/compiler:kotlin-stdlib",
         "//src/main/kotlin/io/bazel/kotlin/builder/tasks",
         "//src/main/kotlin/io/bazel/kotlin/builder/toolchain",
         "//src/main/kotlin/io/bazel/kotlin/builder/utils",
@@ -30,8 +32,6 @@ java_library(
         "//src/main/protobuf:kotlin_model_java_proto",
         "//src/main/protobuf:worker_protocol_java_proto",
         "//third_party:dagger",
-        "@com_github_jetbrains_kotlin//:annotations",
-        "@com_github_jetbrains_kotlin//:kotlin-stdlib",
         "@kotlin_rules_maven//:javax_annotation_javax_annotation_api",
         "@kotlin_rules_maven//:javax_inject_javax_inject",
     ],
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/cmd/BUILD.bazel b/src/main/kotlin/io/bazel/kotlin/builder/cmd/BUILD.bazel
index 4eaaac62c..76da46109 100644
--- a/src/main/kotlin/io/bazel/kotlin/builder/cmd/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/kotlin/builder/cmd/BUILD.bazel
@@ -15,24 +15,25 @@ kt_bootstrap_library(
 kt_bootstrap_binary(
     name = "build",
     data = [
+        "//kotlin/compiler:jvm-abi-gen",
+        "//kotlin/compiler:kotlin-annotation-processing",
+        "//kotlin/compiler:kotlin-compiler",
+        "//kotlin/compiler:symbol-processing-api",
+        "//kotlin/compiler:symbol-processing-cmdline",
         "//src/main/kotlin:jdeps-gen",
         "//src/main/kotlin:skip-code-gen",
         "//src/main/kotlin/io/bazel/kotlin/compiler",
-        "@com_github_google_ksp//:symbol-processing-api",
-        "@com_github_google_ksp//:symbol-processing-cmdline",
-        "@com_github_jetbrains_kotlin//:jvm-abi-gen",
-        "@com_github_jetbrains_kotlin//:kotlin-annotation-processing",
-        "@com_github_jetbrains_kotlin//:kotlin-compiler",
+        "@com_github_jetbrains_kotlin//:home",
     ],
     jvm_flags = [
-        "-D@com_github_jetbrains_kotlin...jvm-abi-gen=$(rlocationpath @com_github_jetbrains_kotlin//:jvm-abi-gen)",
-        "-D@com_github_jetbrains_kotlin...kotlin-compiler=$(rlocationpath @com_github_jetbrains_kotlin//:kotlin-compiler)",
-        "-D@com_github_jetbrains_kotlin...kapt=$(rlocationpath @com_github_jetbrains_kotlin//:kotlin-annotation-processing)",
+        "-D@com_github_jetbrains_kotlin...jvm-abi-gen=$(rlocationpath //kotlin/compiler:jvm-abi-gen)",
+        "-D@com_github_jetbrains_kotlin...kotlin-compiler=$(rlocationpath //kotlin/compiler:kotlin-compiler)",
+        "-D@com_github_jetbrains_kotlin...kapt=$(rlocationpath //kotlin/compiler:kotlin-annotation-processing)",
         "-D@rules_kotlin...jdeps-gen=$(rlocationpath //src/main/kotlin:jdeps-gen)",
         "-D@rules_kotlin...skip-code-gen=$(rlocationpath //src/main/kotlin:skip-code-gen)",
         "-D@rules_kotlin...compiler=$(rlocationpath //src/main/kotlin/io/bazel/kotlin/compiler)",
-        "-D@com_github_google_ksp...symbol-processing-api=$(rlocationpath @com_github_google_ksp//:symbol-processing-api)",
-        "-D@com_github_google_ksp...symbol-processing-cmdline=$(rlocationpath @com_github_google_ksp//:symbol-processing-cmdline)",
+        "-D@com_github_google_ksp...symbol-processing-api=$(rlocationpath //kotlin/compiler:symbol-processing-api)",
+        "-D@com_github_google_ksp...symbol-processing-cmdline=$(rlocationpath //kotlin/compiler:symbol-processing-cmdline)",
         "-XX:-MaxFDLimit",
     ],
     main_class = "io.bazel.kotlin.builder.cmd.Build",
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/tasks/BUILD.bazel b/src/main/kotlin/io/bazel/kotlin/builder/tasks/BUILD.bazel
index 10d018393..d8acfc648 100644
--- a/src/main/kotlin/io/bazel/kotlin/builder/tasks/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/kotlin/builder/tasks/BUILD.bazel
@@ -24,6 +24,7 @@ kt_bootstrap_library(
     ],
     visibility = ["//src:__subpackages__"],
     deps = [
+        "//kotlin/compiler:kotlin-preloader",
         "//src/main/kotlin/io/bazel/kotlin/builder/toolchain",
         "//src/main/kotlin/io/bazel/kotlin/builder/utils",
         "//src/main/kotlin/io/bazel/kotlin/builder/utils/jars",
@@ -31,7 +32,6 @@ kt_bootstrap_library(
         "//src/main/protobuf:deps_java_proto",
         "//src/main/protobuf:kotlin_model_java_proto",
         "//src/main/protobuf:worker_protocol_java_proto",
-        "@com_github_jetbrains_kotlin//:kotlin-preloader",
         "@kotlin_rules_maven//:com_google_protobuf_protobuf_java",
         "@kotlin_rules_maven//:com_google_protobuf_protobuf_java_util",
         "@kotlin_rules_maven//:javax_inject_javax_inject",
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/toolchain/BUILD.bazel b/src/main/kotlin/io/bazel/kotlin/builder/toolchain/BUILD.bazel
index 4cda9aeeb..1d579832f 100644
--- a/src/main/kotlin/io/bazel/kotlin/builder/toolchain/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/kotlin/builder/toolchain/BUILD.bazel
@@ -19,18 +19,18 @@ kt_bootstrap_library(
         "*.kt",
     ]),
     neverlink_deps = [
-        "@com_github_jetbrains_kotlin//:jvm-abi-gen",
-        "@com_github_jetbrains_kotlin//:kotlin-compiler",
-        "@com_github_google_ksp//:symbol-processing-api",
-        "@com_github_google_ksp//:symbol-processing-cmdline",
+        "//kotlin/compiler:jvm-abi-gen",
+        "//kotlin/compiler:kotlin-compiler",
+        "//kotlin/compiler:symbol-processing-api",
+        "//kotlin/compiler:symbol-processing-cmdline",
     ],
     visibility = ["//src:__subpackages__"],
     deps = [
+        "//kotlin/compiler:kotlin-preloader",
         "//src/main/kotlin/io/bazel/kotlin/builder/utils",
         "//src/main/kotlin/io/bazel/kotlin/plugin:skip-code-gen-lib",
         "//src/main/kotlin/io/bazel/kotlin/plugin/jdeps:jdeps-gen-lib",
         "//src/main/protobuf:kotlin_model_java_proto",
-        "@com_github_jetbrains_kotlin//:kotlin-preloader",
         "@kotlin_rules_maven//:com_google_protobuf_protobuf_java",
         "@kotlin_rules_maven//:com_google_protobuf_protobuf_java_util",
         "@kotlin_rules_maven//:javax_inject_javax_inject",
diff --git a/src/main/kotlin/io/bazel/kotlin/compiler/BUILD.bazel b/src/main/kotlin/io/bazel/kotlin/compiler/BUILD.bazel
index 4c310e7e8..3a1472670 100644
--- a/src/main/kotlin/io/bazel/kotlin/compiler/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/kotlin/compiler/BUILD.bazel
@@ -20,9 +20,9 @@ kt_bootstrap_library(
     name = "compiler",
     srcs = glob(["*.kt"]),
     neverlink_deps = [
-        "@com_github_jetbrains_kotlin//:kotlin-compiler",
-        "@com_github_jetbrains_kotlin//:kotlin-annotation-processing",
-        "@com_github_jetbrains_kotlin//:kotlin-script-runtime",
+        "//kotlin/compiler:kotlin-compiler",
+        "//kotlin/compiler:kotlin-annotation-processing",
+        "//kotlin/compiler:kotlin-script-runtime",
     ],
     visibility = ["//src:__subpackages__"],
 )
diff --git a/src/main/kotlin/io/bazel/kotlin/generate/BUILD.bazel b/src/main/kotlin/io/bazel/kotlin/generate/BUILD.bazel
index 82e305c13..4ce016764 100644
--- a/src/main/kotlin/io/bazel/kotlin/generate/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/kotlin/generate/BUILD.bazel
@@ -4,8 +4,8 @@ kt_jvm_library(
     name = "kotlin_release_options_lib",
     srcs = glob(["**/*.kt"]),
     deps = [
-        "@com_github_jetbrains_kotlin//:kotlin-compiler",
-        "@com_github_jetbrains_kotlin//:kotlin-reflect",
+        "//kotlin/compiler:kotlin-compiler",
+        "//kotlin/compiler:kotlin-reflect",
     ],
 )
 
diff --git a/src/main/kotlin/io/bazel/kotlin/plugin/BUILD.bazel b/src/main/kotlin/io/bazel/kotlin/plugin/BUILD.bazel
index eaa662124..dc1cd8502 100644
--- a/src/main/kotlin/io/bazel/kotlin/plugin/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/kotlin/plugin/BUILD.bazel
@@ -22,7 +22,7 @@ kt_bootstrap_library(
     srcs = glob(["*.kt"]),
     visibility = ["//src:__subpackages__"],
     deps = [
-        "@com_github_jetbrains_kotlin//:kotlin-compiler",
+        "//kotlin/compiler:kotlin-compiler",
     ],
 )
 
diff --git a/src/main/kotlin/io/bazel/kotlin/plugin/jdeps/BUILD.bazel b/src/main/kotlin/io/bazel/kotlin/plugin/jdeps/BUILD.bazel
index 60f5b07ee..48a6f1bf8 100644
--- a/src/main/kotlin/io/bazel/kotlin/plugin/jdeps/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/kotlin/plugin/jdeps/BUILD.bazel
@@ -22,9 +22,9 @@ kt_bootstrap_library(
     srcs = glob(["*.kt"]),
     visibility = ["//src:__subpackages__"],
     deps = [
+        "//kotlin/compiler:kotlin-compiler",
         "//src/main/kotlin/io/bazel/kotlin/builder/utils/jars",
         "//src/main/protobuf:deps_java_proto",
-        "@com_github_jetbrains_kotlin//:kotlin-compiler",
         "@kotlin_rules_maven//:com_google_protobuf_protobuf_java",
     ],
 )
diff --git a/src/main/starlark/BUILD.bazel b/src/main/starlark/BUILD.bazel
index 4d7c3bf4d..39795f02f 100644
--- a/src/main/starlark/BUILD.bazel
+++ b/src/main/starlark/BUILD.bazel
@@ -3,9 +3,6 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
 release_archive(
     name = "pkg",
-    srcs = glob(
-        ["*.bzl"],
-    ),
     package_dir = "src/main/starlark",  # explicitly set the package directory, as there are no parent release_archives.
     src_map = {
         "BUILD.release.bazel": "BUILD.bazel",
@@ -17,7 +14,7 @@ release_archive(
 
 bzl_library(
     name = "starlark",
-    srcs = glob(["*.bzl"]),
+    srcs = [],
     visibility = ["//visibility:public"],
     deps = [
         "//src/main/starlark/core",
diff --git a/src/main/starlark/core/options/BUILD.bazel b/src/main/starlark/core/options/BUILD.bazel
index af636259a..59d6a7d7e 100644
--- a/src/main/starlark/core/options/BUILD.bazel
+++ b/src/main/starlark/core/options/BUILD.bazel
@@ -13,9 +13,8 @@ release_archive(
 
 bzl_library(
     name = "options",
-    srcs = glob(["*.bzl"]),
-    visibility = ["//:__subpackages__"],
-    deps = [
-        "@com_github_jetbrains_kotlin//:capabilities",
+    srcs = glob(["*.bzl"]) + [
+        "@com_github_jetbrains_kotlin//:capabilities.bzl",
     ],
+    visibility = ["//:__subpackages__"],
 )
diff --git a/src/main/starlark/core/repositories/BUILD b/src/main/starlark/core/repositories/BUILD
index d5a58b72f..09d8a2c6f 100644
--- a/src/main/starlark/core/repositories/BUILD
+++ b/src/main/starlark/core/repositories/BUILD
@@ -18,6 +18,8 @@ release_archive(
     name = "pkg",
     srcs = [
         "BUILD.com_github_google_ksp.bazel",
+        "BUILD.com_github_jetbrains_kotlin.bazel",
+        "compiler.bzl",
         "ksp.bzl",
         "versions.bzl",
     ],
@@ -35,7 +37,6 @@ bzl_library(
     srcs = glob(["*.bzl"]),
     visibility = ["//:__subpackages__"],
     deps = [
-        "//src/main/starlark/core/repositories/kotlin",
         "@rules_proto//proto",
         "@rules_proto//proto/private",
     ],
diff --git a/src/main/starlark/core/repositories/BUILD.com_github_google_ksp.bazel b/src/main/starlark/core/repositories/BUILD.com_github_google_ksp.bazel
index ade6ddfe3..4114f50d2 100644
--- a/src/main/starlark/core/repositories/BUILD.com_github_google_ksp.bazel
+++ b/src/main/starlark/core/repositories/BUILD.com_github_google_ksp.bazel
@@ -11,9 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# io_bazel_rules_kotlin
-load("@{{.KotlinRulesRepository}}//kotlin:jvm.bzl", "kt_jvm_import")
-
 package(default_visibility = ["//visibility:public"])
 
 # KSP filegroup containing everything that might be needed
@@ -21,16 +18,3 @@ filegroup(
     name = "ksp",
     srcs = glob(["**"]),
 )
-
-# Create imports for all of the jars
-[
-    kt_jvm_import(
-        name = "%s" % jar,
-        jar = "%s.jar" % jar,
-    )
-    for jar in [
-        "symbol-processing",
-        "symbol-processing-api",
-        "symbol-processing-cmdline",
-    ]
-]
diff --git a/src/main/starlark/core/repositories/BUILD.com_github_jetbrains_kotlin.bazel b/src/main/starlark/core/repositories/BUILD.com_github_jetbrains_kotlin.bazel
new file mode 100644
index 000000000..782b6e857
--- /dev/null
+++ b/src/main/starlark/core/repositories/BUILD.com_github_jetbrains_kotlin.bazel
@@ -0,0 +1,20 @@
+# Copyright 2018 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+package(default_visibility = ["//visibility:public"])
+
+# Kotlin home filegroup containing everything that is needed.
+filegroup(
+    name = "home",
+    srcs = glob(["**"]),
+)
diff --git a/src/main/starlark/core/repositories/kotlin/compiler.bzl b/src/main/starlark/core/repositories/compiler.bzl
similarity index 69%
rename from src/main/starlark/core/repositories/kotlin/compiler.bzl
rename to src/main/starlark/core/repositories/compiler.bzl
index ab03814bb..98919b5c1 100644
--- a/src/main/starlark/core/repositories/kotlin/compiler.bzl
+++ b/src/main/starlark/core/repositories/compiler.bzl
@@ -13,9 +13,6 @@ def _kotlin_compiler_impl(repository_ctx):
     repository_ctx.template(
         "BUILD.bazel",
         attr._template,
-        substitutions = {
-            "{{.KotlinRulesRepository}}": attr.kotlin_rules,
-        },
         executable = False,
     )
 
@@ -38,12 +35,12 @@ def _get_capability_template(compiler_version, templates):
     return templates[0]
 
 _CAPABILITIES_TEMPLATES = {
-    "legacy": "capabilities_legacy.bzl.com_github_jetbrains_kotlin.bazel",  # keep first
-    "1.4": "capabilities_1.4.bzl.com_github_jetbrains_kotlin.bazel",
-    "1.5": "capabilities_1.5.bzl.com_github_jetbrains_kotlin.bazel",
-    "1.6": "capabilities_1.6.bzl.com_github_jetbrains_kotlin.bazel",
-    "1.7": "capabilities_1.7.bzl.com_github_jetbrains_kotlin.bazel",
-    "1.8": "capabilities_1.8.bzl.com_github_jetbrains_kotlin.bazel",
+    "legacy": "//src/main/starlark/core/repositories/kotlin:capabilities_legacy.bzl.com_github_jetbrains_kotlin.bazel",  # keep first
+    "1.4": "//src/main/starlark/core/repositories/kotlin:capabilities_1.4.bzl.com_github_jetbrains_kotlin.bazel",
+    "1.5": "//src/main/starlark/core/repositories/kotlin:capabilities_1.5.bzl.com_github_jetbrains_kotlin.bazel",
+    "1.6": "//src/main/starlark/core/repositories/kotlin:capabilities_1.6.bzl.com_github_jetbrains_kotlin.bazel",
+    "1.7": "//src/main/starlark/core/repositories/kotlin:capabilities_1.7.bzl.com_github_jetbrains_kotlin.bazel",
+    "1.8": "//src/main/starlark/core/repositories/kotlin:capabilities_1.8.bzl.com_github_jetbrains_kotlin.bazel",
 }
 
 kotlin_compiler_repository = repository_rule(
@@ -53,10 +50,6 @@ kotlin_compiler_repository = repository_rule(
             doc = "A list of urls for the kotlin compiler",
             mandatory = True,
         ),
-        "kotlin_rules": attr.string(
-            doc = "target of the kotlin rules.",
-            mandatory = True,
-        ),
         "sha256": attr.string(
             doc = "sha256 of the compiler archive",
         ),
@@ -65,7 +58,7 @@ kotlin_compiler_repository = repository_rule(
         ),
         "_template": attr.label(
             doc = "repository build file template",
-            default = "BUILD.com_github_jetbrains_kotlin.bazel",
+            default = ":BUILD.com_github_jetbrains_kotlin.bazel",
         ),
         "_capabilities_templates": attr.label_list(
             doc = "compiler capabilities file templates",
diff --git a/src/main/starlark/core/repositories/download.bzl b/src/main/starlark/core/repositories/download.bzl
index 2aa8d703c..0ce95d020 100644
--- a/src/main/starlark/core/repositories/download.bzl
+++ b/src/main/starlark/core/repositories/download.bzl
@@ -63,7 +63,7 @@ def kt_download_local_dev_dependencies():
         name = "rules_jvm_external",
         sha256 = versions.RULES_JVM_EXTERNAL_SHA,
         strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-        url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+        url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (versions.RULES_JVM_EXTERNAL_TAG, versions.RULES_JVM_EXTERNAL_TAG),
     )
 
     versions.use_repository(
diff --git a/src/main/starlark/core/repositories/initialize.release.bzl b/src/main/starlark/core/repositories/initialize.release.bzl
index dccdfb492..d32caccc4 100644
--- a/src/main/starlark/core/repositories/initialize.release.bzl
+++ b/src/main/starlark/core/repositories/initialize.release.bzl
@@ -25,7 +25,7 @@ load(
     "http_file",
 )
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
-load("//src/main/starlark/core/repositories/kotlin:compiler.bzl", "kotlin_compiler_repository")
+load(":compiler.bzl", "kotlin_compiler_repository")
 load(":ksp.bzl", "ksp_compiler_plugin_repository")
 load(":versions.bzl", "version", _versions = "versions")
 
@@ -52,7 +52,6 @@ def kotlin_repositories(
         name = compiler_repository_name,
         urls = [url.format(version = compiler_release.version) for url in compiler_release.url_templates],
         sha256 = compiler_release.sha256,
-        kotlin_rules = RULES_KOTLIN.workspace_name,
         compiler_version = compiler_release.version,
     )
 
@@ -61,7 +60,6 @@ def kotlin_repositories(
         urls = [url.format(version = ksp_compiler_release.version) for url in ksp_compiler_release.url_templates],
         sha256 = ksp_compiler_release.sha256,
         strip_version = ksp_compiler_release.version,
-        kotlin_rules = RULES_KOTLIN.workspace_name,
     )
 
     http_file(
@@ -70,7 +68,7 @@ def kotlin_repositories(
                  versions.BAZEL_JAVA_LAUNCHER_VERSION +
                  "/src/main/java/com/google/devtools/build/lib/bazel/rules/java/" +
                  "java_stub_template.txt")],
-        sha256 = "ab1370fd990a8bff61a83c7bd94746a3401a6d5d2299e54b1b6bc02db4f87f68",
+        sha256 = "78e29525872594ffc783c825f428b3e61d4f3e632f46eaa64f004b2814c4a612",
     )
 
     maybe(
@@ -95,6 +93,12 @@ def kotlin_repositories(
         version = versions.RULES_PYTHON,
     )
 
+    versions.use_repository(
+        name = "rules_java",
+        rule = http_archive,
+        version = versions.RULES_JAVA,
+    )
+
     # See note in versions.bzl before updating bazel_skylib
     maybe(
         http_archive,
diff --git a/src/main/starlark/core/repositories/kotlin/BUILD b/src/main/starlark/core/repositories/kotlin/BUILD
index a104eced6..61d1d09d1 100644
--- a/src/main/starlark/core/repositories/kotlin/BUILD
+++ b/src/main/starlark/core/repositories/kotlin/BUILD
@@ -1,17 +1,8 @@
 load("//src/main/starlark/release:packager.bzl", "release_archive")
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
 release_archive(
     name = "pkg",
     srcs = [
         "BUILD",
-        "BUILD.com_github_jetbrains_kotlin.bazel",
-        "compiler.bzl",
     ] + glob(["capabilities_*.bazel"]),
 )
-
-bzl_library(
-    name = "kotlin",
-    srcs = glob(["*.bzl"]),
-    visibility = ["//:__subpackages__"],
-)
diff --git a/src/main/starlark/core/repositories/kotlin/BUILD.com_github_jetbrains_kotlin.bazel b/src/main/starlark/core/repositories/kotlin/BUILD.com_github_jetbrains_kotlin.bazel
deleted file mode 100644
index 9e0559964..000000000
--- a/src/main/starlark/core/repositories/kotlin/BUILD.com_github_jetbrains_kotlin.bazel
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 2018 The Bazel Authors. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# io_bazel_rules_kotlin
-load("@{{.KotlinRulesRepository}}//kotlin:jvm.bzl", "kt_jvm_import")
-load("@{{.KotlinRulesRepository}}//kotlin:js.bzl", "kt_js_import")
-load("@rules_java//java:defs.bzl", "java_import")
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-
-package(default_visibility = ["//visibility:public"])
-
-exports_files(
-    ["capabilities.bzl"],
-)
-
-# Kotlin home filegroup containing everything that is needed.
-filegroup(
-    name = "home",
-    srcs = glob(["**"]),
-)
-
-kt_jvm_import(
-    name = "annotations",
-    jar = "lib/annotations-13.0.jar",
-)
-
-kt_jvm_import(
-    name = "trove4j",
-    jar = "lib/trove4j.jar",
-)
-
-kt_jvm_import(
-    name = "jvm-abi-gen",
-    jar = "lib/jvm-abi-gen.jar",
-)
-
-kt_jvm_import(
-    name = "kotlin-compiler",
-    jar = "lib/kotlin-compiler.jar",
-    neverlink = 1,
-    deps = [
-        ":annotations",
-        ":kotlin-reflect",
-        ":kotlin-script-runtime",
-        ":kotlin-stdlib",
-        ":trove4j",
-    ],
-)
-
-kt_jvm_import(
-    name = "kotlin-annotation-processing-runtime",
-    jar = "lib/kotlin-annotation-processing-runtime.jar",
-)
-
-kt_jvm_import(
-    name = "kotlin-annotation-processing",
-    jar = "lib/kotlin-annotation-processing.jar",
-)
-
-kt_jvm_import(
-    name = "kotlinx-serialization-compiler-plugin",
-    jar = "lib/kotlinx-serialization-compiler-plugin.jar",
-)
-
-kt_jvm_import(
-    name = "allopen-compiler-plugin",
-    jar = "lib/allopen-compiler-plugin.jar",
-)
-
-kt_jvm_import(
-    name = "noarg-compiler-plugin",
-    jar = "lib/noarg-compiler-plugin.jar",
-)
-
-kt_jvm_import(
-    name = "sam-with-receiver-compiler-plugin",
-    jar = "lib/sam-with-receiver-compiler-plugin.jar",
-)
-
-kt_jvm_import(
-    name = "parcelize-compiler-plugin",
-    jar = "lib/parcelize-compiler.jar",
-)
-
-kt_jvm_import(
-    name = "parcelize-runtime",
-    jar = "lib/parcelize-runtime.jar",
-)
-
-# Kotlin dependencies that are internal to this repo and may be linked.
-[
-    java_import(
-        name = "kotlin-%s" % art,
-        jars = ["lib/kotlin-%s.jar" % art],
-    )
-    for art in [
-        "preloader",
-    ]
-]
-
-#  The Kotlin standard libraries. These should be setup in a Toolchain.
-[
-    kt_jvm_import(
-        name = "kotlin-%s" % art,
-        jar = "lib/kotlin-%s.jar" % art,
-        srcjar = "lib/kotlin-%s-sources.jar" % art,
-        visibility = ["//visibility:public"],
-    )
-    for art in [
-        "stdlib",
-        "stdlib-jdk7",
-        "stdlib-jdk8",
-        "reflect",
-        "test",
-        "script-runtime",
-    ]
-]
-
-#  The Kotlin JS standard libraries. These should be setup in a Toolchain.
-[
-    kt_js_import(
-        name = "kotlin-%s" % art,
-        jars = ["lib/kotlin-%s.jar" % art],
-        srcjar = "lib/kotlin-%s-sources.jar" % art,
-        visibility = ["//visibility:public"],
-    )
-    for art in [
-        "test-js",
-        "stdlib-js",
-    ]
-]
-
-bzl_library(
-    name = "capabilities",
-    srcs = ["capabilities.bzl"],
-)
diff --git a/src/main/starlark/core/repositories/ksp.bzl b/src/main/starlark/core/repositories/ksp.bzl
index f605c09e5..dc1c3ca19 100644
--- a/src/main/starlark/core/repositories/ksp.bzl
+++ b/src/main/starlark/core/repositories/ksp.bzl
@@ -30,9 +30,6 @@ def _ksp_compiler_plugin_repository_impl(repository_ctx):
     repository_ctx.template(
         "BUILD.bazel",
         attr._template,
-        substitutions = {
-            "{{.KotlinRulesRepository}}": attr.kotlin_rules,
-        },
         executable = False,
     )
 
@@ -43,10 +40,6 @@ ksp_compiler_plugin_repository = repository_rule(
             doc = "A list of urls for the kotlin compiler",
             mandatory = True,
         ),
-        "kotlin_rules": attr.string(
-            doc = "target of the kotlin rules.",
-            mandatory = True,
-        ),
         "sha256": attr.string(
             doc = "sha256 of the compiler archive",
         ),
diff --git a/src/main/starlark/core/repositories/versions.bzl b/src/main/starlark/core/repositories/versions.bzl
index 5ee0999de..809854ef0 100644
--- a/src/main/starlark/core/repositories/versions.bzl
+++ b/src/main/starlark/core/repositories/versions.bzl
@@ -35,8 +35,8 @@ versions = struct(
     SKYLIB_SHA = "f7be3474d42aae265405a592bb7da8e171919d74c16f082a5457840f06054728",
     PROTOBUF_VERSION = "3.11.3",
     PROTOBUF_SHA = "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852",
-    RULES_JVM_EXTERNAL_TAG = "4.4.2",
-    RULES_JVM_EXTERNAL_SHA = "735602f50813eb2ea93ca3f5e43b1959bd80b213b836a07a62a29d757670b77b",
+    RULES_JVM_EXTERNAL_TAG = "5.3",
+    RULES_JVM_EXTERNAL_SHA = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac",
     RULES_PROTO = version(
         version = "5.3.0-21.7",
         sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
@@ -53,7 +53,7 @@ versions = struct(
             "https://github.com/bazelbuild/stardoc/releases/download/{version}/stardoc-{version}.tar.gz",
         ],
     ),
-    BAZEL_JAVA_LAUNCHER_VERSION = "5.0.0",
+    BAZEL_JAVA_LAUNCHER_VERSION = "6.2.1",
     PINTEREST_KTLINT = version(
         version = "0.49.1",
         url_templates = [
@@ -102,6 +102,14 @@ versions = struct(
         ],
         sha256 = "a644da969b6824cc87f8fe7b18101a8a6c57da5db39caa6566ec6109f37d2141",
     ),
+    # needed for rules_pkg and java
+    RULES_JAVA = version(
+        version = "6.4.0",
+        url_templates = [
+            "https://github.com/bazelbuild/rules_java/releases/download/{version}/rules_java-{version}.tar.gz",
+        ],
+        sha256 = "27abf8d2b26f4572ba4112ae8eb4439513615018e03a299f85a8460f6992f6a3",
+    ),
     RULES_LICENSE = version(
         version = "0.0.3",
         url_templates = [
diff --git a/src/test/kotlin/io/bazel/kotlin/BUILD b/src/test/kotlin/io/bazel/kotlin/BUILD
index 513ec3f32..f87a75b32 100644
--- a/src/test/kotlin/io/bazel/kotlin/BUILD
+++ b/src/test/kotlin/io/bazel/kotlin/BUILD
@@ -22,13 +22,13 @@ kt_jvm_library(
     srcs = ["KotlinAssertionTestCase.kt"],
     visibility = ["//visibility:public"],
     exports = [
-        "@com_github_jetbrains_kotlin//:kotlin-test",
+        "//kotlin/compiler:kotlin-test",
         "@kotlin_rules_maven//:com_google_guava_guava",
         "@kotlin_rules_maven//:com_google_truth_truth",
         "@kotlin_rules_maven//:junit_junit",
     ],
     deps = [
-        "@com_github_jetbrains_kotlin//:kotlin-test",
+        "//kotlin/compiler:kotlin-test",
         "@kotlin_rules_maven//:com_google_guava_guava",
     ],
 )
diff --git a/src/test/kotlin/io/bazel/kotlin/builder/BUILD b/src/test/kotlin/io/bazel/kotlin/builder/BUILD
index 9a1a714ca..26e205e1e 100644
--- a/src/test/kotlin/io/bazel/kotlin/builder/BUILD
+++ b/src/test/kotlin/io/bazel/kotlin/builder/BUILD
@@ -45,9 +45,9 @@ java_library(
     ],
     exports = _COMMON_DEPS,
     runtime_deps = [
+        "//kotlin/compiler:kotlin-reflect",
+        "//kotlin/compiler:kotlin-stdlib",
         "@bazel_tools//tools/jdk:JacocoCoverage",
-        "@com_github_jetbrains_kotlin//:kotlin-reflect",
-        "@com_github_jetbrains_kotlin//:kotlin-stdlib",
     ],
     deps = _COMMON_DEPS + [
         "//src/main/kotlin/io/bazel/kotlin/builder/tasks",
diff --git a/src/test/kotlin/io/bazel/kotlin/builder/KotlinAbstractTestBuilder.java b/src/test/kotlin/io/bazel/kotlin/builder/KotlinAbstractTestBuilder.java
index 8aff079e2..dc1a804b2 100644
--- a/src/test/kotlin/io/bazel/kotlin/builder/KotlinAbstractTestBuilder.java
+++ b/src/test/kotlin/io/bazel/kotlin/builder/KotlinAbstractTestBuilder.java
@@ -229,14 +229,14 @@ static KotlinToolchain toolchainForTest() {
         }
         return KotlinToolchain.createToolchain(
                 javaHome,
-                new File(Deps.Dep.fromLabel("@com_github_jetbrains_kotlin//:kotlin-compiler").singleCompileJar()),
+                new File(Deps.Dep.fromLabel("//kotlin/compiler:kotlin-compiler").singleCompileJar()),
                 new File(Deps.Dep.fromLabel("//src/main/kotlin/io/bazel/kotlin/compiler").singleCompileJar()),
-                new File(Deps.Dep.fromLabel("@com_github_jetbrains_kotlin//:jvm-abi-gen").singleCompileJar()),
+                new File(Deps.Dep.fromLabel("//kotlin/compiler:jvm-abi-gen").singleCompileJar()),
                 new File(Deps.Dep.fromLabel("//src/main/kotlin:skip-code-gen").singleCompileJar()),
                 new File(Deps.Dep.fromLabel("//src/main/kotlin:jdeps-gen").singleCompileJar()),
-                new File(Deps.Dep.fromLabel("@com_github_jetbrains_kotlin//:kotlin-annotation-processing").singleCompileJar()),
-                new File(Deps.Dep.fromLabel("@com_github_google_ksp//:symbol-processing-api").singleCompileJar()),
-                new File(Deps.Dep.fromLabel("@com_github_google_ksp//:symbol-processing-cmdline").singleCompileJar())
+                new File(Deps.Dep.fromLabel("//kotlin/compiler:kotlin-annotation-processing").singleCompileJar()),
+                new File(Deps.Dep.fromLabel("//kotlin/compiler:symbol-processing-api").singleCompileJar()),
+                new File(Deps.Dep.fromLabel("//kotlin/compiler:symbol-processing-cmdline").singleCompileJar())
         );
     }
 }
diff --git a/src/test/kotlin/io/bazel/kotlin/builder/KotlinJvmTestBuilder.java b/src/test/kotlin/io/bazel/kotlin/builder/KotlinJvmTestBuilder.java
index b74a91486..39c07aeb8 100644
--- a/src/test/kotlin/io/bazel/kotlin/builder/KotlinJvmTestBuilder.java
+++ b/src/test/kotlin/io/bazel/kotlin/builder/KotlinJvmTestBuilder.java
@@ -35,11 +35,11 @@ public final class KotlinJvmTestBuilder extends KotlinAbstractTestBuilder<JvmCom
 
     @SuppressWarnings({"unused", "WeakerAccess"})
     public static Dep
-            KOTLIN_ANNOTATIONS = Dep.fromLabel("@com_github_jetbrains_kotlin//:annotations"),
-            KOTLIN_STDLIB = Dep.fromLabel("@com_github_jetbrains_kotlin//:kotlin-stdlib"),
-            KOTLIN_STDLIB_JDK7 = Dep.fromLabel("@com_github_jetbrains_kotlin//:kotlin-stdlib-jdk7"),
-            KOTLIN_STDLIB_JDK8 = Dep.fromLabel("@com_github_jetbrains_kotlin//:kotlin-stdlib-jdk8"),
-            JVM_ABI_GEN = Dep.fromLabel("@com_github_jetbrains_kotlin//:jvm-abi-gen");
+            KOTLIN_ANNOTATIONS = Dep.fromLabel("//kotlin/compiler:annotations"),
+            KOTLIN_STDLIB = Dep.fromLabel("//kotlin/compiler:kotlin-stdlib"),
+            KOTLIN_STDLIB_JDK7 = Dep.fromLabel("//kotlin/compiler:kotlin-stdlib-jdk7"),
+            KOTLIN_STDLIB_JDK8 = Dep.fromLabel("//kotlin/compiler:kotlin-stdlib-jdk8"),
+            JVM_ABI_GEN = Dep.fromLabel("//kotlin/compiler:jvm-abi-gen");
 
     private static final JvmCompilationTask.Builder taskBuilder = JvmCompilationTask.newBuilder();
     private static final EnumSet<DirectoryType> ALL_DIRECTORY_TYPES =
diff --git a/src/test/kotlin/io/bazel/kotlin/defs.bzl b/src/test/kotlin/io/bazel/kotlin/defs.bzl
index b9ebd5077..fbc96bfe7 100644
--- a/src/test/kotlin/io/bazel/kotlin/defs.bzl
+++ b/src/test/kotlin/io/bazel/kotlin/defs.bzl
@@ -34,15 +34,15 @@ def kt_rules_test(name, **kwargs):
         "//src/main/kotlin/io/bazel/kotlin/compiler",
         "//src/main/kotlin:skip-code-gen",
         "//src/main/kotlin:jdeps-gen",
-        "@com_github_google_ksp//:symbol-processing-api",
-        "@com_github_google_ksp//:symbol-processing-cmdline",
-        "@com_github_jetbrains_kotlin//:annotations",
-        "@com_github_jetbrains_kotlin//:jvm-abi-gen",
-        "@com_github_jetbrains_kotlin//:kotlin-compiler",
-        "@com_github_jetbrains_kotlin//:kotlin-stdlib",
-        "@com_github_jetbrains_kotlin//:kotlin-stdlib-jdk7",
-        "@com_github_jetbrains_kotlin//:kotlin-stdlib-jdk8",
-        "@com_github_jetbrains_kotlin//:kotlin-annotation-processing",
+        "//kotlin/compiler:symbol-processing-api",
+        "//kotlin/compiler:symbol-processing-cmdline",
+        "//kotlin/compiler:annotations",
+        "//kotlin/compiler:jvm-abi-gen",
+        "//kotlin/compiler:kotlin-compiler",
+        "//kotlin/compiler:kotlin-stdlib",
+        "//kotlin/compiler:kotlin-stdlib-jdk7",
+        "//kotlin/compiler:kotlin-stdlib-jdk8",
+        "//kotlin/compiler:kotlin-annotation-processing",
     ] + args["data"]:
         if dep not in args["data"]:
             args["data"].append(dep)
diff --git a/src/test/kotlin/io/bazel/kotlin/integration/BUILD.bazel b/src/test/kotlin/io/bazel/kotlin/integration/BUILD.bazel
index bbe02ffec..1bf2ffb97 100644
--- a/src/test/kotlin/io/bazel/kotlin/integration/BUILD.bazel
+++ b/src/test/kotlin/io/bazel/kotlin/integration/BUILD.bazel
@@ -14,7 +14,7 @@ kt_jvm_test(
     srcs = ["WriteWorkspaceTest.kt"],
     deps = [
         ":lib",
-        "@com_github_jetbrains_kotlin//:kotlin-test",
+        "//kotlin/compiler:kotlin-test",
         "@kotlin_rules_maven//:com_google_truth_truth",
         "@kotlin_rules_maven//:junit_junit",
     ],
@@ -30,7 +30,7 @@ kt_jvm_test(
     test_class = "io.bazel.kotlin.integration.MixedSourceCompileTest",
     deps = [
         ":lib",
-        "@com_github_jetbrains_kotlin//:kotlin-test",
+        "//kotlin/compiler:kotlin-test",
         "@kotlin_rules_maven//:com_google_truth_truth",
         "@kotlin_rules_maven//:junit_junit",
     ],