diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 64fd003..3d7b701 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -1,8 +1,6 @@
 ---
 platforms:
   rbe_ubuntu1604:
-    build_targets:
-    - "@rbe_default//rbe_config_cc:toolchain"
     test_targets:
     - "//tests/config:debian-jessie-autoconfig_test"
     # TODO(nlopezgi): reenable this test once bazel 0.19.2 is out
diff --git a/WORKSPACE b/WORKSPACE
index 62becf6..2b9ee27 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -98,7 +98,7 @@
     output_base = "configs/ubuntu16_04_clang/1.1",
 )
 
-load("@bazel_toolchains//rules:environments.bzl", "clang_env")
+load("//rules:environments.bzl", "clang_env")
 
 rbe_autoconfig(
     name = "rbe_msan_with_output_base",
diff --git a/rules/rbe_repo.bzl b/rules/rbe_repo.bzl
index 285b433..800c92d 100644
--- a/rules/rbe_repo.bzl
+++ b/rules/rbe_repo.bzl
@@ -162,12 +162,12 @@
 """
 
 load(
-    "@bazel_toolchains//rules:version_check.bzl",
+    "//rules:version_check.bzl",
     "extract_version_number",
     "parse_rc",
 )
 load(
-    "@bazel_toolchains//rules:toolchain_containers.bzl",
+    "//rules:toolchain_containers.bzl",
     "RBE_UBUNTU16_04_LATEST",
     "public_rbe_ubuntu16_04_sha256s",
 )
@@ -591,7 +591,7 @@
     implementation = _impl,
 )
 
-load("@bazel_toolchains//rules:environments.bzl", "clang_env")
+load("//rules:environments.bzl", "clang_env")
 
 def rbe_autoconfig(
         name,