diff --git a/.bazelrc b/.bazelrc
index 80cc2cfbf8da..548edd1bbc25 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -532,7 +532,6 @@ build:rbe-envoy-engflow --define=engflow_rbe=true
 
 build:remote-envoy-engflow --config=common-envoy-engflow
 build:remote-envoy-engflow --config=cache-envoy-engflow
-build:remote-envoy-engflow --config=bes-envoy-engflow
 build:remote-envoy-engflow --config=rbe-envoy-engflow
 
 #############################################################################
@@ -557,6 +556,7 @@ common:debug --config=debug-sandbox
 common:debug --config=debug-coverage
 common:debug --config=debug-tests
 
+try-import %workspace%/repo.bazelrc
 try-import %workspace%/clang.bazelrc
 try-import %workspace%/user.bazelrc
 try-import %workspace%/local_tsan.bazelrc
diff --git a/.github/workflows/_run.yml b/.github/workflows/_run.yml
index 0eb58ff56770..f5555070f1ca 100644
--- a/.github/workflows/_run.yml
+++ b/.github/workflows/_run.yml
@@ -286,6 +286,10 @@ jobs:
         BAZEL_BUILD_EXTRA_OPTIONS="--google_credentials=/build/${GCP_SERVICE_ACCOUNT_KEY_FILE} --config=remote-ci --config=rbe-google"
         echo "BAZEL_BUILD_EXTRA_OPTIONS=${BAZEL_BUILD_EXTRA_OPTIONS}" >> "$GITHUB_ENV"
 
+    - run: |
+        echo "${{ vars.ENVOY_CI_BAZELRC }}" > repo.bazelrc
+      if: ${{ vars.ENVOY_CI_BAZELRC }}
+
     - uses: envoyproxy/toolshed/gh-actions/github/run@actions-v0.2.37
       name: Run CI ${{ inputs.command }} ${{ inputs.target }}
       with: