diff --git a/infra/bots/bazel.py b/infra/bots/bazel.py
index b9af104..1e49e9a 100644
--- a/infra/bots/bazel.py
+++ b/infra/bots/bazel.py
@@ -63,12 +63,10 @@
       cmd = [build_or_test, "//..."]
       if local_or_rbe == "rbe":
         if linux:
-          cmd += ["--config=linux-rbe", "--google_default_credentials"]
+          cmd += ["--config=linux-rbe"]
         else: # Windows
-          # TODO(lovisolo): Use --google_default_credentials when Windows bots
-          #                 are rebuilt with the correct credentials.
-          cmd += ["--config=windows-rbe",
-                  "--google_credentials=C:\\b\\s\\w\\ir\\skia_infra_rbe_key\\rbe-ci.json"]
+          cmd += ["--config=windows-rbe"]
+        cmd += ["--google_default_credentials"]
 
       bazel(cmd)
 
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 5312c7f..c52c608 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -272,11 +272,6 @@
           "name": "skia/bots/bazel_win",
           "path": "bazel_win",
           "version": "version:0"
-        },
-        {
-          "name": "skia/internal/skia_infra_rbe_key",
-          "path": "skia_infra_rbe_key",
-          "version": "version:3"
         }
       ],
       "command": [
@@ -309,11 +304,6 @@
           "name": "skia/bots/bazel_win",
           "path": "bazel_win",
           "version": "version:0"
-        },
-        {
-          "name": "skia/internal/skia_infra_rbe_key",
-          "path": "skia_infra_rbe_key",
-          "version": "version:3"
         }
       ],
       "command": [