diff --git a/wasm-cc/WORKSPACE b/wasm-cc/WORKSPACE
index b9e50d5f..861cb131 100644
--- a/wasm-cc/WORKSPACE
+++ b/wasm-cc/WORKSPACE
@@ -6,6 +6,9 @@ load_envoy_example_wasmcc_archives()
 load("//bazel:deps_pre.bzl", "resolve_envoy_example_wasmcc_pre_dependencies")
 resolve_envoy_example_wasmcc_pre_dependencies()
 
+load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
+compatibility_proxy_repo()
+
 load("//bazel:deps.bzl", "resolve_envoy_example_wasmcc_dependencies")
 resolve_envoy_example_wasmcc_dependencies()
 
diff --git a/wasm-cc/bazel/deps.bzl b/wasm-cc/bazel/deps.bzl
index eb67f449..acc95e00 100644
--- a/wasm-cc/bazel/deps.bzl
+++ b/wasm-cc/bazel/deps.bzl
@@ -2,9 +2,7 @@ load("@emsdk//:deps.bzl", emsdk_deps = "deps")
 load("@envoy//bazel:api_binding.bzl", "envoy_api_binding")
 load("@envoy_toolshed//sysroot:sysroot.bzl", "setup_sysroots")
 load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies")
-load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
 load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
-load("@rules_fuzzing//fuzzing:repositories.bzl", "rules_fuzzing_dependencies")
 load("@rules_perl//perl:deps.bzl", "perl_rules_dependencies")
 load("@rules_python//python:repositories.bzl", "py_repositories")
 load("@toolchains_llvm//toolchain:deps.bzl", "bazel_toolchain_dependencies")
@@ -16,7 +14,6 @@ def resolve_envoy_example_wasmcc_dependencies(
         llvm_version=VERSIONS["llvm"],
         ninja_version=VERSIONS["ninja"],
         setup_autotools_toolchain=True):
-    compatibility_proxy_repo()
     envoy_api_binding()
     py_repositories()
     bazel_toolchain_dependencies()
@@ -28,10 +25,6 @@ def resolve_envoy_example_wasmcc_dependencies(
     )
     emsdk_deps()
     perl_rules_dependencies()
-    rules_fuzzing_dependencies(
-        oss_fuzz = True,
-        honggfuzz = False,
-    )
     setup_sysroots()
     if llvm_version != False:
         llvm_toolchain(
diff --git a/wasm-cc/bazel/packages.bzl b/wasm-cc/bazel/packages.bzl
index fcfa02a4..5f8c63d5 100644
--- a/wasm-cc/bazel/packages.bzl
+++ b/wasm-cc/bazel/packages.bzl
@@ -1,6 +1,7 @@
 load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features")
 load("@emsdk//:emscripten_deps.bzl", "emscripten_deps")
 load("@envoy//bazel:repositories.bzl", "default_envoy_build_config")
+load("@rules_fuzzing//fuzzing:repositories.bzl", "rules_fuzzing_dependencies")
 load("@rules_python//python:pip.bzl", "pip_parse")
 load("//bazel:versions.bzl", "VERSIONS")
 
@@ -14,3 +15,7 @@ def load_envoy_example_wasmcc_packages():
     emscripten_deps(emscripten_version = "4.0.6")
     default_envoy_build_config(name = "envoy_build_config")
     proto_bazel_features(name = "proto_bazel_features")
+    rules_fuzzing_dependencies(
+        oss_fuzz = True,
+        honggfuzz = False,
+    )
diff --git a/wasm-cc/bazel/versions.bzl b/wasm-cc/bazel/versions.bzl
index 2442a47c..0c488229 100644
--- a/wasm-cc/bazel/versions.bzl
+++ b/wasm-cc/bazel/versions.bzl
@@ -111,8 +111,8 @@ VERSIONS = {
     "rules_cc": {
         "type": "github_archive",
         "repo": "bazelbuild/rules_cc",
-        "version": "0.2.22",
-        "sha256": "81c10a95a5c22d838276ee90d712635d6042419fdfca5ef88328226b6321e53b",
+        "version": "0.2.17",
+        "sha256": "283fa1cdaaf172337898749cf4b9b1ef5ea269da59540954e51fba0e7b8f277a",
         "url": "https://github.com/{repo}/releases/download/{version}/{name}-{version}.tar.gz",
         "strip_prefix": "{name}-{version}",
     },
@@ -135,6 +135,14 @@ VERSIONS = {
         "strip_prefix": "{name}-{version}",
     },
 
+    "rules_java": {
+        "type": "github_archive",
+        "repo": "bazelbuild/rules_java",
+        "version": "9.7.0",
+        "sha256": "68794ca344c1caf13dca65f90c06660823013fa080931266e2625103904a664e",
+        "url": "https://github.com/{repo}/releases/download/{version}/rules_java-{version}.tar.gz",
+    },
+
     "rules_perl": {
         "type": "github_archive",
         "repo": "bazel-contrib/rules_perl",