diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0bc3616251e300..12d372eb082d5d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -174,19 +174,19 @@ jobs:
         uses: Homebrew/actions/setup-homebrew@master
 
       - name: Build Docker image
-        run: docker build -t brew --build-arg=version=16.04 .
+        run: docker build -t brew --build-arg=version=22.04 .
 
       - name: Deploy the Docker image to GitHub Packages and Docker Hub
         if: github.ref == 'refs/heads/master'
         run: |
           echo ${{secrets.HOMEBREW_BREW_GITHUB_PACKAGES_TOKEN}} |
             docker login ghcr.io -u BrewTestBot --password-stdin
-          docker tag brew "ghcr.io/homebrew/ubuntu16.04:master"
-          docker push "ghcr.io/homebrew/ubuntu16.04:master"
+          docker tag brew "ghcr.io/homebrew/ubuntu22.04:master"
+          docker push "ghcr.io/homebrew/ubuntu22.04:master"
           echo ${{secrets.HOMEBREW_BREW_DOCKER_TOKEN}} |
             docker login -u brewtestbot --password-stdin
-          docker tag brew "homebrew/ubuntu16.04:master"
-          docker push "homebrew/ubuntu16.04:master"
+          docker tag brew "homebrew/ubuntu22.04:master"
+          docker push "homebrew/ubuntu22.04:master"
 
   tests:
     name: ${{ matrix.name }}
diff --git a/Library/Homebrew/formula_auditor.rb b/Library/Homebrew/formula_auditor.rb
index e73655392377ba..c9f14ee3c4c5ca 100644
--- a/Library/Homebrew/formula_auditor.rb
+++ b/Library/Homebrew/formula_auditor.rb
@@ -438,8 +438,7 @@ def audit_postgresql
     def audit_glibc
       return unless @core_tap
       return if formula.name != "glibc"
-      # Also allow LINUX_GLIBC_NEXT_CI_VERSION for when we're upgrading.
-      return if [OS::LINUX_GLIBC_CI_VERSION, OS::LINUX_GLIBC_NEXT_CI_VERSION].include?(formula.version.to_s)
+      return if formula.version.to_s == OS::LINUX_GLIBC_CI_VERSION
 
       problem "The glibc version must be #{OS::LINUX_GLIBC_CI_VERSION}, as needed by our CI on Linux. " \
               "The glibc formula is for users who have a system glibc with a lower version, " \
diff --git a/Library/Homebrew/os.rb b/Library/Homebrew/os.rb
index ac480c374f5591..c2fe5b9f5a6a02 100644
--- a/Library/Homebrew/os.rb
+++ b/Library/Homebrew/os.rb
@@ -45,15 +45,11 @@ def self.kernel_name
 
   ::OS_VERSION = ENV.fetch("HOMEBREW_OS_VERSION").freeze
 
-  LINUX_CI_OS_VERSION = "Ubuntu 16.04"
-  LINUX_GLIBC_CI_VERSION = "2.23"
-  LINUX_GCC_CI_VERSION = "5.0"
-  LINUX_PREFERRED_GCC_FORMULA = "gcc@5"
-
-  # Ubuntu 22.04 (see Linux-CI.md)
-  LINUX_GLIBC_NEXT_CI_VERSION = "2.35"
-  # LINUX_GCC_CI_VERSION = "11.0"
-  # LINUX_PREFERRED_GCC_FORMULA = "gcc@11"
+  # See Linux-CI.md
+  LINUX_CI_OS_VERSION = "Ubuntu 22.04"
+  LINUX_GLIBC_CI_VERSION = "2.35"
+  LINUX_GCC_CI_VERSION = "11.0"
+  LINUX_PREFERRED_GCC_FORMULA = "gcc@11"
 
   if OS.mac?
     require "os/mac"