diff --git a/.azure-pipelines/stage/checks.yml b/.azure-pipelines/stage/checks.yml
index 8c03249e227b..78b085d1c62e 100644
--- a/.azure-pipelines/stage/checks.yml
+++ b/.azure-pipelines/stage/checks.yml
@@ -101,6 +101,8 @@ jobs:
         displayName: "Upload $(CI_TARGET) Report to GCS"
         condition: and(not(canceled()), or(eq(variables['CI_TARGET'], 'coverage'), eq(variables['CI_TARGET'], 'fuzz_coverage')))
         env:
+          # This is for gcc
+          ENVOY_CONTRIB_BUILD: 1
           GCS_ARTIFACT_BUCKET: ${{ parameters.bucketGCP }}
 
 - job: complete
diff --git a/ci/do_ci.sh b/ci/do_ci.sh
index e500dd8792a4..bda0e54c5601 100755
--- a/ci/do_ci.sh
+++ b/ci/do_ci.sh
@@ -764,6 +764,10 @@ case $CI_TARGET in
             -- "${TEST_TARGETS[@]}"
         echo "bazel release build with gcc..."
         bazel_envoy_binary_build fastbuild
+        if [[ -n "$ENVOY_CONTRIB_BUILD" ]]; then
+            echo "bazel contrib build with gcc..."
+            bazel_contrib_binary_build fastbuild
+        fi
         ;;
 
     info)
diff --git a/ci/run_envoy_docker.sh b/ci/run_envoy_docker.sh
index 094572f3b56d..f65b8c056e54 100755
--- a/ci/run_envoy_docker.sh
+++ b/ci/run_envoy_docker.sh
@@ -147,6 +147,7 @@ docker run --rm \
        -e ENVOY_BUILD_DEBUG_INFORMATION \
        -e ENVOY_BUILD_FILTER_EXAMPLE \
        -e ENVOY_COMMIT \
+       -e ENVOY_CONTRIB_BUILD \
        -e ENVOY_HEAD_REF \
        -e ENVOY_PUBLISH_DRY_RUN \
        -e ENVOY_REPO \