diff --git a/tools/registry.py b/tools/registry.py
index ad55da6fba4..5d0a9267ffb 100644
--- a/tools/registry.py
+++ b/tools/registry.py
@@ -385,14 +385,17 @@ def add(self, module, override=False):
       shutil.copy(module.presubmit_yml, presubmit_yml)
     else:
       PLATFORMS = ["debian10", "ubuntu2004", "macos", "macos_arm64", "windows"]
+      BAZEL_VERSIONS = ["7.x", "6.x"]
       presubmit = {
           "matrix": {
               "platform": PLATFORMS.copy(),
+              "bazel": BAZEL_VERSIONS.copy(),
           },
           "tasks": {
               "verify_targets": {
                   "name": "Verify build targets",
                   "platform": "${{ platform }}",
+                  "bazel": "${{ bazel }}",
                   "build_targets": module.build_targets.copy()
               }
           }
@@ -402,6 +405,7 @@ def add(self, module, override=False):
         task = {
             "name": "Run test module",
             "platform": "${{ platform }}",
+            "bazel": "${{ bazel }}",
         }
         if module.test_module_build_targets:
           task["build_targets"] = module.test_module_build_targets.copy()