diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index b45602f5e..9761e19fb 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -2,10 +2,8 @@
 matrix:
   unittest_platform:
     - ubuntu2004
-    - ubuntu1804
   integration_platform:
     - ubuntu2004
-    - ubuntu1804
     # - macos
     # - windows re-enable when rules_bazel_integration_test can support custom test runner on windows.
   test_flags:
@@ -35,7 +33,9 @@ tasks:
       - "--config=rbe"
     test_targets:
       - //examples:all
-  rbe_ubuntu1604:
+  rbe_ubuntu2004:
+    platform: ubuntu2004
+    name: "RBE"
     test_targets:
       - "--"
       - "//src/test/kotlin/io/bazel/kotlin/builder:builder_tests"
@@ -50,7 +50,7 @@ tasks:
       - "--strategy=KotlinCompile=remote"
   stardoc:
     name: Stardoc api documentation
-    platform: ubuntu1804
+    platform: ubuntu2004
     build_flags:
       - "--enable_bzlmod=true"
     build_targets:
@@ -59,7 +59,7 @@ tasks:
       - //docs:are_docs_up_to_date_test
   ktlint:
     name: KtLint
-    platform: ubuntu1804
+    platform: ubuntu2004
     test_targets:
       - //...
     test_flags:
diff --git a/.bazelrc b/.bazelrc
index 0a74bad97..4726d6b2c 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -12,8 +12,10 @@ build --verbose_failures
 # Required for windows ci
 startup --windows_enable_symlinks
 common --enable_runfiles
+# Newer versions of Bazel enable this by default
+common --incompatible_disallow_empty_glob
 
 try-import %workspace%/bit-ignore.bazelrc
 
 # User-specific .bazelrc
-try-import %workspace%/user.bazelrc
+try-import %workspace%/user.bazelrc
\ No newline at end of file
diff --git a/MODULE.bazel b/MODULE.bazel
index 28526277c..dce0b0dce 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -1,6 +1,6 @@
 module(
     name = "rules_kotlin",
-    version = "1.8.1",
+    version = "2.1.0",
     compatibility_level = 1,
     repo_name = "rules_kotlin",
 )
@@ -36,7 +36,7 @@ use_repo(remote_android_extensions, "android_gmaven_r8", "android_tools")
 # TODO(bencodes) A bunch of these dependencies need to be marked as dev_dependencies but before we can do that
 # we need to sort out a few cases around how these rules are consumed in various ways.
 
-bazel_dep(name = "rules_jvm_external", version = "5.3")
+bazel_dep(name = "rules_jvm_external", version = "6.3")
 bazel_dep(name = "bazel_ci_rules", version = "1.0.0")
 
 rbe_preconfig = use_repo_rule("@bazel_ci_rules//:rbe_repo.bzl", "rbe_preconfig")
@@ -52,8 +52,6 @@ maven.install(
     artifacts = [
         "com.google.code.findbugs:jsr305:3.0.2",
         "junit:junit:4.13-beta-3",
-        "com.google.protobuf:protobuf-java:3.6.0",
-        "com.google.protobuf:protobuf-java-util:3.6.0",
         "com.google.guava:guava:27.1-jre",
         "com.google.truth:truth:0.45",
         "com.google.auto.service:auto-service:1.1.1",
@@ -98,9 +96,9 @@ maven.override(
 )
 use_repo(maven, "kotlin_rules_maven", "unpinned_kotlin_rules_maven")
 
-bazel_dep(name = "rules_pkg", version = "0.7.0")
-bazel_dep(name = "stardoc", version = "0.7.0", repo_name = "io_bazel_stardoc")
-bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
+bazel_dep(name = "rules_pkg", version = "1.0.1")
+bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
+bazel_dep(name = "stardoc", version = "0.7.2", repo_name = "io_bazel_stardoc")
 
 bazel_dep(name = "rules_testing", version = "0.5.0", dev_dependency = True)
 bazel_dep(name = "rules_bazel_integration_test", version = "0.25.0", dev_dependency = True)
diff --git a/kotlin/BUILD b/kotlin/BUILD
index 482d4599d..0fdbbd912 100644
--- a/kotlin/BUILD
+++ b/kotlin/BUILD
@@ -1,5 +1,3 @@
-load("@io_bazel_stardoc//stardoc:stardoc.bzl", "stardoc")
-
 # Copyright 2018 The Bazel Authors. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +11,7 @@ load("@io_bazel_stardoc//stardoc:stardoc.bzl", "stardoc")
 # 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("@io_bazel_stardoc//stardoc:stardoc.bzl", "stardoc")
 load("//src/main/starlark/release:packager.bzl", "release_archive")
 
 release_archive(
diff --git a/kotlin/compiler/BUILD.release.bazel b/kotlin/compiler/BUILD.release.bazel
index b1685565a..af31fc37d 100644
--- a/kotlin/compiler/BUILD.release.bazel
+++ b/kotlin/compiler/BUILD.release.bazel
@@ -28,6 +28,5 @@ bzl_library(
     name = "compiler",
     srcs = glob(["*.bzl"]),
     deps = [
-        "@rules_proto//proto:repositories",
     ],
 )
diff --git a/kotlin/internal/BUILD b/kotlin/internal/BUILD
index 7e5bd217c..019803452 100644
--- a/kotlin/internal/BUILD
+++ b/kotlin/internal/BUILD
@@ -46,5 +46,6 @@ bzl_library(
         "//src/main/starlark/core/compile",
         "//src/main/starlark/core/options",
         "@rules_java//java:rules",
+        "@rules_java//java/private:proto_support",
     ],
 )
diff --git a/kotlin_rules_maven_install.json b/kotlin_rules_maven_install.json
index 7a20a7654..3885e4549 100755
--- a/kotlin_rules_maven_install.json
+++ b/kotlin_rules_maven_install.json
@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -788868969,
-  "__RESOLVED_ARTIFACTS_HASH": 1873973417,
+  "__INPUT_ARTIFACTS_HASH": -2064659652,
+  "__RESOLVED_ARTIFACTS_HASH": 30072322,
   "conflict_resolution": {
     "com.google.guava:guava:27.1-jre": "com.google.guava:guava:33.2.1-jre"
   },
@@ -48,13 +48,6 @@
       },
       "version": "3.0.2"
     },
-    "com.google.code.gson:gson": {
-      "shasums": {
-        "jar": "2d43eb5ea9e133d2ee2405cc14f5ee08951b8361302fdd93494a3a997b508d32",
-        "sources": "2d3220d5d936f0a26258aa3b358160741a4557e046a001251e5799c2db0f0d74"
-      },
-      "version": "2.7"
-    },
     "com.google.dagger:dagger": {
       "shasums": {
         "jar": "19680b0f42baa7f9414dacae8663244d323d084a6ee5594ad115a17f3be37c05",
@@ -139,20 +132,6 @@
       },
       "version": "3.0.0"
     },
-    "com.google.protobuf:protobuf-java": {
-      "shasums": {
-        "jar": "8c8a65be83e75ccdcaa21417e303025f1708ea01e8c0a05d6c770e64b6c09ea1",
-        "sources": "88411bb0333725b27bf53ed4d95785f6f4b541e22e1e27c60c2be8b3115fc5c4"
-      },
-      "version": "3.6.0"
-    },
-    "com.google.protobuf:protobuf-java-util": {
-      "shasums": {
-        "jar": "ad7f8d67674906ce88077fbb233b427b7068991a61af42ce9301990bdf8f3605",
-        "sources": "a2959842caed6f0b1dbecfaf0e73ef03117416f967c0532c32d092b6e2b98d60"
-      },
-      "version": "3.6.0"
-    },
     "com.google.truth:truth": {
       "shasums": {
         "jar": "0f7dced2a16e55a77e44fc3ff9c5be98d4bf4bb30abc18d78ffd735df950a69f",
@@ -536,11 +515,6 @@
       "com.google.j2objc:j2objc-annotations",
       "org.checkerframework:checker-qual"
     ],
-    "com.google.protobuf:protobuf-java-util": [
-      "com.google.code.gson:gson",
-      "com.google.guava:guava",
-      "com.google.protobuf:protobuf-java"
-    ],
     "com.google.truth:truth": [
       "com.google.auto.value:auto-value-annotations",
       "com.google.errorprone:error_prone_annotations",
@@ -655,9 +629,6 @@
       "org.ow2.asm:asm-commons"
     ]
   },
-  "skipped": [
-    "com.google.guava:listenablefuture:jar:sources"
-  ],
   "packages": {
     "com.google.auto.service:auto-service": [
       "com.google.auto.service.processor"
@@ -750,15 +721,6 @@
       "javax.annotation.concurrent",
       "javax.annotation.meta"
     ],
-    "com.google.code.gson:gson": [
-      "com.google.gson",
-      "com.google.gson.annotations",
-      "com.google.gson.internal",
-      "com.google.gson.internal.bind",
-      "com.google.gson.internal.bind.util",
-      "com.google.gson.reflect",
-      "com.google.gson.stream"
-    ],
     "com.google.dagger:dagger": [
       "dagger",
       "dagger.assisted",
@@ -913,13 +875,6 @@
     "com.google.j2objc:j2objc-annotations": [
       "com.google.j2objc.annotations"
     ],
-    "com.google.protobuf:protobuf-java": [
-      "com.google.protobuf",
-      "com.google.protobuf.compiler"
-    ],
-    "com.google.protobuf:protobuf-java-util": [
-      "com.google.protobuf.util"
-    ],
     "com.google.truth:truth": [
       "com.google.common.truth"
     ],
@@ -1463,8 +1418,6 @@
       "com.google.auto:auto-common:jar:sources",
       "com.google.code.findbugs:jsr305",
       "com.google.code.findbugs:jsr305:jar:sources",
-      "com.google.code.gson:gson",
-      "com.google.code.gson:gson:jar:sources",
       "com.google.dagger:dagger",
       "com.google.dagger:dagger-compiler",
       "com.google.dagger:dagger-compiler:jar:sources",
@@ -1488,10 +1441,6 @@
       "com.google.guava:listenablefuture",
       "com.google.j2objc:j2objc-annotations",
       "com.google.j2objc:j2objc-annotations:jar:sources",
-      "com.google.protobuf:protobuf-java",
-      "com.google.protobuf:protobuf-java-util",
-      "com.google.protobuf:protobuf-java-util:jar:sources",
-      "com.google.protobuf:protobuf-java:jar:sources",
       "com.google.truth:truth",
       "com.google.truth:truth:jar:sources",
       "com.googlecode.java-diff-utils:diffutils",
@@ -1598,8 +1547,6 @@
       "com.google.auto:auto-common:jar:sources",
       "com.google.code.findbugs:jsr305",
       "com.google.code.findbugs:jsr305:jar:sources",
-      "com.google.code.gson:gson",
-      "com.google.code.gson:gson:jar:sources",
       "com.google.dagger:dagger",
       "com.google.dagger:dagger-compiler",
       "com.google.dagger:dagger-compiler:jar:sources",
@@ -1623,10 +1570,6 @@
       "com.google.guava:listenablefuture",
       "com.google.j2objc:j2objc-annotations",
       "com.google.j2objc:j2objc-annotations:jar:sources",
-      "com.google.protobuf:protobuf-java",
-      "com.google.protobuf:protobuf-java-util",
-      "com.google.protobuf:protobuf-java-util:jar:sources",
-      "com.google.protobuf:protobuf-java:jar:sources",
       "com.google.truth:truth",
       "com.google.truth:truth:jar:sources",
       "com.googlecode.java-diff-utils:diffutils",
@@ -1733,8 +1676,6 @@
       "com.google.auto:auto-common:jar:sources",
       "com.google.code.findbugs:jsr305",
       "com.google.code.findbugs:jsr305:jar:sources",
-      "com.google.code.gson:gson",
-      "com.google.code.gson:gson:jar:sources",
       "com.google.dagger:dagger",
       "com.google.dagger:dagger-compiler",
       "com.google.dagger:dagger-compiler:jar:sources",
@@ -1758,10 +1699,6 @@
       "com.google.guava:listenablefuture",
       "com.google.j2objc:j2objc-annotations",
       "com.google.j2objc:j2objc-annotations:jar:sources",
-      "com.google.protobuf:protobuf-java",
-      "com.google.protobuf:protobuf-java-util",
-      "com.google.protobuf:protobuf-java-util:jar:sources",
-      "com.google.protobuf:protobuf-java:jar:sources",
       "com.google.truth:truth",
       "com.google.truth:truth:jar:sources",
       "com.googlecode.java-diff-utils:diffutils",
@@ -1856,5 +1793,91 @@
       "org.pantsbuild:jarjar:jar:sources"
     ]
   },
+  "services": {
+    "com.google.auto.service:auto-service": {
+      "javax.annotation.processing.Processor": [
+        "com.google.auto.service.processor.AutoServiceProcessor"
+      ]
+    },
+    "com.google.auto.service:auto-service:jar:sources": {
+      "javax.annotation.processing.Processor": [
+        "com.google.auto.service.processor.AutoServiceProcessor"
+      ]
+    },
+    "com.google.auto.value:auto-value": {
+      "autovalue.shaded.kotlinx.metadata.impl.extensions.MetadataExtensions": [
+        "autovalue.shaded.kotlinx.metadata.jvm.impl.JvmMetadataExtensions"
+      ],
+      "com.google.auto.value.extension.AutoValueExtension": [
+        "com.google.auto.value.extension.memoized.processor.MemoizeExtension",
+        "com.google.auto.value.extension.serializable.processor.SerializableAutoValueExtension",
+        "com.google.auto.value.extension.toprettystring.processor.ToPrettyStringExtension"
+      ],
+      "com.google.auto.value.extension.serializable.serializer.interfaces.SerializerExtension": [
+        "com.google.auto.value.extension.serializable.serializer.impl.ImmutableListSerializerExtension",
+        "com.google.auto.value.extension.serializable.serializer.impl.ImmutableMapSerializerExtension",
+        "com.google.auto.value.extension.serializable.serializer.impl.OptionalSerializerExtension"
+      ],
+      "javax.annotation.processing.Processor": [
+        "com.google.auto.value.extension.memoized.processor.MemoizedValidator",
+        "com.google.auto.value.extension.toprettystring.processor.ToPrettyStringValidator",
+        "com.google.auto.value.processor.AutoAnnotationProcessor",
+        "com.google.auto.value.processor.AutoBuilderProcessor",
+        "com.google.auto.value.processor.AutoOneOfProcessor",
+        "com.google.auto.value.processor.AutoValueBuilderProcessor",
+        "com.google.auto.value.processor.AutoValueProcessor"
+      ]
+    },
+    "com.google.dagger:dagger-compiler": {
+      "com.google.devtools.ksp.processing.SymbolProcessorProvider": [
+        "dagger.internal.codegen.KspComponentProcessor$Provider"
+      ],
+      "javax.annotation.processing.Processor": [
+        "dagger.internal.codegen.ComponentProcessor"
+      ]
+    },
+    "com.google.dagger:dagger-spi": {
+      "dagger.spi.internal.shaded.androidx.room.jarjarred.kotlin.metadata.internal.extensions.MetadataExtensions": [
+        "dagger.spi.internal.shaded.androidx.room.jarjarred.kotlin.metadata.jvm.internal.JvmMetadataExtensions"
+      ],
+      "dagger.spi.internal.shaded.kotlin.metadata.internal.extensions.MetadataExtensions": [
+        "dagger.spi.internal.shaded.kotlin.metadata.jvm.internal.JvmMetadataExtensions"
+      ]
+    },
+    "com.squareup.moshi:moshi-kotlin-codegen": {
+      "com.google.devtools.ksp.processing.SymbolProcessorProvider": [
+        "com.squareup.moshi.kotlin.codegen.ksp.JsonClassSymbolProcessorProvider"
+      ],
+      "com.squareup.moshi.kotlinx.metadata.internal.extensions.MetadataExtensions": [
+        "com.squareup.moshi.kotlinx.metadata.jvm.internal.JvmMetadataExtensions"
+      ],
+      "javax.annotation.processing.Processor": [
+        "com.squareup.moshi.kotlin.codegen.apt.JsonClassCodegenProcessor"
+      ]
+    },
+    "dev.zacsweers.autoservice:auto-service-ksp": {
+      "com.google.devtools.ksp.processing.SymbolProcessorProvider": [
+        "dev.zacsweers.autoservice.ksp.AutoServiceSymbolProcessor$Provider"
+      ]
+    },
+    "org.eclipse.sisu:org.eclipse.sisu.inject": {
+      "javax.annotation.processing.Processor": [
+        "org.eclipse.sisu.space.SisuIndexAPT6"
+      ]
+    },
+    "org.jetbrains.kotlin:kotlin-reflect": {
+      "kotlin.reflect.jvm.internal.impl.builtins.BuiltInsLoader": [
+        "kotlin.reflect.jvm.internal.impl.serialization.deserialization.builtins.BuiltInsLoaderImpl"
+      ],
+      "kotlin.reflect.jvm.internal.impl.resolve.ExternalOverridabilityCondition": [
+        "kotlin.reflect.jvm.internal.impl.load.java.ErasedOverridabilityCondition",
+        "kotlin.reflect.jvm.internal.impl.load.java.FieldOverridabilityCondition",
+        "kotlin.reflect.jvm.internal.impl.load.java.JavaIncompatibilityRulesOverridabilityCondition"
+      ]
+    }
+  },
+  "skipped": [
+    "com.google.guava:listenablefuture:jar:sources"
+  ],
   "version": "2"
 }
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 d8acfc648..9fd6f1c70 100644
--- a/src/main/kotlin/io/bazel/kotlin/builder/tasks/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/kotlin/builder/tasks/BUILD.bazel
@@ -32,8 +32,8 @@ kt_bootstrap_library(
         "//src/main/protobuf:deps_java_proto",
         "//src/main/protobuf:kotlin_model_java_proto",
         "//src/main/protobuf:worker_protocol_java_proto",
-        "@kotlin_rules_maven//:com_google_protobuf_protobuf_java",
-        "@kotlin_rules_maven//:com_google_protobuf_protobuf_java_util",
+        "@com_google_protobuf//:protobuf_java",
+        "@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 fe3390a58..9c633f022 100644
--- a/src/main/kotlin/io/bazel/kotlin/builder/toolchain/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/kotlin/builder/toolchain/BUILD.bazel
@@ -31,8 +31,8 @@ kt_bootstrap_library(
         "//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",
-        "@kotlin_rules_maven//:com_google_protobuf_protobuf_java",
-        "@kotlin_rules_maven//:com_google_protobuf_protobuf_java_util",
+        "@com_google_protobuf//:protobuf_java",
+        "@com_google_protobuf//:protobuf_java_util",
         "@kotlin_rules_maven//:javax_inject_javax_inject",
     ],
 )
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/toolchain/CompilationTaskContext.kt b/src/main/kotlin/io/bazel/kotlin/builder/toolchain/CompilationTaskContext.kt
index 3676806da..c9da0190b 100644
--- a/src/main/kotlin/io/bazel/kotlin/builder/toolchain/CompilationTaskContext.kt
+++ b/src/main/kotlin/io/bazel/kotlin/builder/toolchain/CompilationTaskContext.kt
@@ -93,7 +93,7 @@ class CompilationTaskContext(
     header: String,
     msg: MessageOrBuilder,
   ) {
-    printLines(header, TextFormat.printToString(msg).split("\n"), filterEmpty = true)
+    printLines(header, TextFormat.printer().printToString(msg).split("\n"), filterEmpty = true)
   }
 
   /**
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/utils/BUILD.bazel b/src/main/kotlin/io/bazel/kotlin/builder/utils/BUILD.bazel
index 1f5982c55..3177eb197 100644
--- a/src/main/kotlin/io/bazel/kotlin/builder/utils/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/kotlin/builder/utils/BUILD.bazel
@@ -12,7 +12,7 @@ kt_bootstrap_library(
         "//src/main/protobuf:kotlin_model_java_proto",
         "//src/main/protobuf:worker_protocol_java_proto",
         "@bazel_tools//tools/java/runfiles",
-        "@kotlin_rules_maven//:com_google_protobuf_protobuf_java",
-        "@kotlin_rules_maven//:com_google_protobuf_protobuf_java_util",
+        "@com_google_protobuf//:protobuf_java",
+        "@com_google_protobuf//:protobuf_java_util",
     ],
 )
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 5cc2b476e..1980c900f 100644
--- a/src/main/kotlin/io/bazel/kotlin/plugin/jdeps/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/kotlin/plugin/jdeps/BUILD.bazel
@@ -30,7 +30,7 @@ kt_bootstrap_library(
         "//kotlin/compiler:kotlin-compiler",
         "//src/main/kotlin/io/bazel/kotlin/builder/utils/jars",
         "//src/main/protobuf:deps_java_proto",
-        "@kotlin_rules_maven//:com_google_protobuf_protobuf_java",
+        "@com_google_protobuf//:protobuf_java",
     ],
 )
 
diff --git a/src/main/protobuf/BUILD b/src/main/protobuf/BUILD
index fc31054d5..7993d0434 100644
--- a/src/main/protobuf/BUILD
+++ b/src/main/protobuf/BUILD
@@ -1,5 +1,5 @@
-load("@rules_java//java:defs.bzl", "java_library", "java_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/src/main/starlark/BUILD.release.bazel b/src/main/starlark/BUILD.release.bazel
index d3984c5c2..35090997e 100644
--- a/src/main/starlark/BUILD.release.bazel
+++ b/src/main/starlark/BUILD.release.bazel
@@ -16,7 +16,10 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
 bzl_library(
     name = "starlark",
-    srcs = glob(["*.bzl"]),
+    srcs = glob(
+        ["*.bzl"],
+        allow_empty = True,
+    ),
     visibility = ["//visibility:public"],
     deps = [
         "//src/main/starlark/core",
diff --git a/src/main/starlark/core/repositories/BUILD.release.bazel b/src/main/starlark/core/repositories/BUILD.release.bazel
index 1d8610115..615d46166 100644
--- a/src/main/starlark/core/repositories/BUILD.release.bazel
+++ b/src/main/starlark/core/repositories/BUILD.release.bazel
@@ -19,6 +19,6 @@ bzl_library(
     srcs = glob(["*.bzl"]),
     visibility = ["//visibility:public"],
     deps = [
-        "@rules_proto//proto:repositories",
+        "@com_google_protobuf//proto:repositories",
     ],
 )
diff --git a/src/main/starlark/core/repositories/download.bzl b/src/main/starlark/core/repositories/download.bzl
index c08af13f7..8be894402 100644
--- a/src/main/starlark/core/repositories/download.bzl
+++ b/src/main/starlark/core/repositories/download.bzl
@@ -23,7 +23,7 @@ def kt_download_local_dev_dependencies():
     Must be called before setup_dependencies in the WORKSPACE.
     """
     versions.use_repository(
-        name = "rules_proto",
+        name = "com_google_protobuf",
         version = versions.RULES_PROTO,
         rule = rules_stardoc_repository,
         starlark_packages = [
diff --git a/src/main/starlark/core/repositories/setup.bzl b/src/main/starlark/core/repositories/setup.bzl
index 7f7f12457..da9efefb5 100644
--- a/src/main/starlark/core/repositories/setup.bzl
+++ b/src/main/starlark/core/repositories/setup.bzl
@@ -14,21 +14,32 @@
 
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 load("@cgrindel_bazel_starlib//:deps.bzl", "bazel_starlib_dependencies")
+load("@com_google_protobuf//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps")
+
+#load("@com_google_protobuf//:protobuf_extra_deps.bzl", "protobuf_extra_deps")
 load("@io_bazel_stardoc//:setup.bzl", "stardoc_repositories")
 load("@rules_bazel_integration_test//bazel_integration_test:deps.bzl", "bazel_integration_test_rules_dependencies")
 load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")
 load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
-load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
 
 def kt_configure():
     """Setup dependencies. Must be called AFTER kt_download_local_dev_dependencies() """
     rules_cc_dependencies()
     rules_cc_toolchains()
 
-    rules_proto_dependencies()
-    rules_proto_toolchains()
+    protobuf_deps()
+    maven_install(
+        name = "protobuf_maven",
+        fetch_sources = True,
+        artifacts = PROTOBUF_MAVEN_ARTIFACTS,
+        repositories = [
+            "https://maven-central.storage.googleapis.com/repos/central/data/",
+            "https://maven.google.com",
+            "https://repo1.maven.org/maven2",
+        ],
+    )
 
     rules_java_dependencies()
     rules_java_toolchains()
diff --git a/src/main/starlark/core/repositories/versions.bzl b/src/main/starlark/core/repositories/versions.bzl
index 6f724696a..96542070f 100644
--- a/src/main/starlark/core/repositories/versions.bzl
+++ b/src/main/starlark/core/repositories/versions.bzl
@@ -29,16 +29,16 @@ versions = struct(
     # 1. Download archive
     # 2. Download dependencies and Configure rules
     # --> 3. Configure dependencies <--
-    SKYLIB_VERSION = "1.4.2",
-    SKYLIB_SHA = "66ffd9315665bfaafc96b52278f57c7e2dd09f5ede279ea6d39b2be471e7e3aa",
+    SKYLIB_VERSION = "1.7.0",
+    SKYLIB_SHA = "d00f1389ee20b60018e92644e0948e16e350a7707219e7a390fb0a99b6ec9262",
     RULES_JVM_EXTERNAL_TAG = "5.3",
     RULES_JVM_EXTERNAL_SHA = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac",
     RULES_PROTO = version(
-        version = "5.3.0-21.7",
-        sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
-        strip_prefix_template = "rules_proto-{version}",
+        version = "29.3",
+        sha256 = "",
+        strip_prefix_template = "protobuf-{version}",
         url_templates = [
-            "https://github.com/bazelbuild/rules_proto/archive/refs/tags/{version}.tar.gz",
+            "https://github.com/protocolbuffers/protobuf/archive/v{version}.tar.gz",
         ],
     ),
     IO_BAZEL_STARDOC = version(
@@ -101,19 +101,19 @@ versions = struct(
     ),
     # needed for rules_pkg and java
     RULES_JAVA = version(
-        version = "7.2.0",
+        version = "8.3.2",
         url_templates = [
             "https://github.com/bazelbuild/rules_java/releases/download/{version}/rules_java-{version}.tar.gz",
         ],
-        sha256 = "eb7db63ed826567b2ceb1ec53d6b729e01636f72c9f5dfb6d2dfe55ad69d1d2a",
+        sha256 = "9b9614f8a7f7b7ed93cb7975d227ece30fe7daed2c0a76f03a5ee37f69e437de",
     ),
     RULES_LICENSE = version(
-        version = "0.0.3",
+        version = "1.0.0",
         url_templates = [
             "https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/{version}/rules_license-{version}.tar.gz",
             "https://github.com/bazelbuild/rules_license/releases/download/{version}/rules_license-{version}.tar.gz",
         ],
-        sha256 = None,
+        sha256 = "26d4021f6898e23b82ef953078389dd49ac2b5618ac564ade4ef87cced147b38",
     ),
     RULES_TESTING = version(
         version = "0.6.0",
@@ -158,9 +158,9 @@ versions = struct(
         ],
     ),
     RULES_CC = version(
-        version = "0.0.9",
+        version = "0.0.15",
         url_templates = ["https://github.com/bazelbuild/rules_cc/releases/download/{version}/rules_cc-{version}.tar.gz"],
-        sha256 = "2037875b9a4456dce4a79d112a8ae885bbc4aad968e6587dca6e64f3a0900cdf",
+        sha256 = "f4aadd8387f381033a9ad0500443a52a0cea5f8ad1ede4369d3c614eb7b2682e",
         strip_prefix_template = "rules_cc-{version}",
     ),
     use_repository = _use_repository,
diff --git a/src/test/kotlin/io/bazel/kotlin/KotlinJvmKspAssertionTest.kt b/src/test/kotlin/io/bazel/kotlin/KotlinJvmKspAssertionTest.kt
index 94204ddf8..e17f61070 100644
--- a/src/test/kotlin/io/bazel/kotlin/KotlinJvmKspAssertionTest.kt
+++ b/src/test/kotlin/io/bazel/kotlin/KotlinJvmKspAssertionTest.kt
@@ -49,7 +49,6 @@ class KotlinJvmKspAssertionTest: KotlinAssertionTestCase("src/test/data/jvm/ksp"
                 "src/test/data/jvm/ksp/CoffeeMaker.class",
                 "src/test/data/jvm/ksp/CoffeeMaker_Factory.class",
                 "src/test/data/jvm/ksp/DaggerCoffeeApp_CoffeeShop.class",
-                "src/test/data/jvm/ksp/DaggerCoffeeApp_CoffeeShop\$1.class",
                 "src/test/data/jvm/ksp/DaggerCoffeeApp_CoffeeShop\$Builder.class",
                 "src/test/data/jvm/ksp/DaggerCoffeeApp_CoffeeShop\$CoffeeShopImpl.class",
                 "src/test/data/jvm/ksp/DripCoffeeModule.class",
@@ -112,7 +111,6 @@ class KotlinJvmKspAssertionTest: KotlinAssertionTestCase("src/test/data/jvm/ksp"
                 "src/test/data/jvm/ksp/CoffeeMaker.class",
                 "src/test/data/jvm/ksp/CoffeeMaker_Factory.class",
                 "src/test/data/jvm/ksp/DaggerCoffeeApp_CoffeeShop.class",
-                "src/test/data/jvm/ksp/DaggerCoffeeApp_CoffeeShop\$1.class",
                 "src/test/data/jvm/ksp/DaggerCoffeeApp_CoffeeShop\$Builder.class",
                 "src/test/data/jvm/ksp/DaggerCoffeeApp_CoffeeShop\$CoffeeShopImpl.class",
                 "src/test/data/jvm/ksp/DripCoffeeModule.class",