diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 1116bc93..d8428575 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -16,6 +16,9 @@ jobs:
       matrix:
         bazel_version: ["6.0.0", "7.0.0"]
         bzlmod: ["--noenable_bzlmod", "--enable_bzlmod"]
+        exclude:
+          - bazel_version: "6.0.0"
+            bzlmod: "--enable_bzlmod"
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
diff --git a/MODULE.bazel b/MODULE.bazel
index 86173c88..bf7beba8 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -4,12 +4,6 @@ module(
     repo_name = "io_grpc_grpc_proto",
 )
 
+bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5", repo_name = "com_google_googleapis")
 bazel_dep(name = "rules_proto", version = "4.0.0")
 bazel_dep(name = "protobuf", version = "23.1", repo_name = "com_google_protobuf")
-# -- bazel_dep definitions -- #
-
-http_archives_extension = use_extension("//bazel:http_archives_extension.bzl", "http_archives_extension")
-use_repo(http_archives_extension, "com_google_googleapis")
-
-switched_rules_extension = use_extension("//bazel:switched_rules_extension.bzl", "switched_rules_extension")
-use_repo(switched_rules_extension, "com_google_googleapis_imports")
diff --git a/bazel/BUILD.bazel b/bazel/BUILD.bazel
deleted file mode 100644
index e69de29b..00000000
diff --git a/bazel/http_archives_extension.bzl b/bazel/http_archives_extension.bzl
deleted file mode 100644
index 79e67a6d..00000000
--- a/bazel/http_archives_extension.bzl
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-def _http_archives_extension_impl(ctx):
-    http_archive(
-        name = "com_google_googleapis",
-        urls = [
-            "https://github.com/googleapis/googleapis/archive/052b274138fce2be80f97b6dcb83ab343c7c8812.tar.gz",
-        ],
-        sha256 = "e31dc9f889bf53e001998d16385881b507c8cc1455bbe5618b16f0f8cb0fd46f",
-        strip_prefix = "googleapis-052b274138fce2be80f97b6dcb83ab343c7c8812",
-    )
-
-http_archives_extension = module_extension(implementation = _http_archives_extension_impl)
diff --git a/bazel/switched_rules_extension.bzl b/bazel/switched_rules_extension.bzl
deleted file mode 100644
index 9499f4f4..00000000
--- a/bazel/switched_rules_extension.bzl
+++ /dev/null
@@ -1,8 +0,0 @@
-load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
-
-def _switched_rules_extension_impl(ctx):
-    switched_rules_by_language(
-        name = "com_google_googleapis_imports",
-    )
-
-switched_rules_extension = module_extension(implementation = _switched_rules_extension_impl)