diff --git a/.github/bors.toml b/.github/bors.toml
index a1dcae5f8bd0..181e4cd46b31 100644
--- a/.github/bors.toml
+++ b/.github/bors.toml
@@ -4,6 +4,9 @@
 # pushed to master.
 status = [
        "Bazel Essential CI (Cockroach)",
+       "check_generated_code",
+       "docker_image_amd64",
+       "examples_orms",
        "macos_amd64_build",
        "macos_arm64_build",
        "windows_build",
diff --git a/.github/workflows/github-actions-essential-ci.yml b/.github/workflows/github-actions-essential-ci.yml
index dcfe180aa32a..2ddae0919345 100644
--- a/.github/workflows/github-actions-essential-ci.yml
+++ b/.github/workflows/github-actions-essential-ci.yml
@@ -50,7 +50,7 @@ jobs:
       - name: clean up
         run: ./build/github/cleanup-engflow-keys.sh
         if: always()
-  EXPERIMENTAL_check_generated_code:
+  check_generated_code:
     runs-on: [self-hosted, basic_runner_group]
     steps:
       - uses: actions/checkout@v4
@@ -64,7 +64,7 @@ jobs:
       - name: clean up
         run: ./build/github/cleanup-engflow-keys.sh
         if: always()
-  EXPERIMENTAL_docker_image_amd64:
+  docker_image_amd64:
     runs-on: [self-hosted, basic_runner_group]
     steps:
       - uses: actions/checkout@v4
@@ -82,7 +82,7 @@ jobs:
       - name: clean up
         run: ./build/github/cleanup-engflow-keys.sh
         if: always()
-  EXPERIMENTAL_examples_orms:
+  examples_orms:
     runs-on: [self-hosted, basic_big_runner_group_fips]
     steps:
       - uses: actions/checkout@v4
diff --git a/build/teamcity/cockroach/ci/tests/check_generated_code.sh b/build/teamcity/cockroach/ci/tests/check_generated_code.sh
deleted file mode 100755
index cb643a3de06d..000000000000
--- a/build/teamcity/cockroach/ci/tests/check_generated_code.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -xeuo pipefail
-
-dir="$(dirname $(dirname $(dirname $(dirname $(dirname "${0}")))))"
-
-source "$dir/teamcity-support.sh"  # For $root
-source "$dir/teamcity-bazel-support.sh"  # For run_bazel
-
-tc_start_block "Ensure generated code is up to date"
-run_bazel build/teamcity/cockroach/ci/tests/check_generated_code_impl.sh
-tc_end_block "Ensure generated code is up to date"
diff --git a/build/teamcity/cockroach/ci/tests/docker_image.sh b/build/teamcity/cockroach/ci/tests/docker_image.sh
deleted file mode 100755
index 8913f303414f..000000000000
--- a/build/teamcity/cockroach/ci/tests/docker_image.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-dir="$(dirname $(dirname $(dirname $(dirname $(dirname "${0}")))))"
-source "$dir/teamcity-support.sh"
-
-tc_prepare
-
-tc_start_block "Run docker image tests"
-
-# Skip for now: #82747
-bazel run \
-  //pkg/testutils/docker:docker_test \
-  --config=crosslinux --config=test \
-  --test_timeout=3000
-
-tc_end_block "Run docker image tests"