diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index fb64720c28..64cc9b0c39 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -18,7 +18,6 @@ steps:
           - "3.3"
           - "3.2"
           - "3.1"
-          - "3.0"
         transport:
           - "8.3"
         ruby_source:
@@ -34,10 +33,6 @@ steps:
             suite: "platinum"
             ruby: "3.1"
           skip: true
-        - with:
-            suite: "platinum"
-            ruby: "3.0"
-          skip: true
         - with:
             suite: "free"
             ruby: "3.3"
diff --git a/.github/workflows/8.x.yml b/.github/workflows/8.16.yml
similarity index 91%
rename from .github/workflows/8.x.yml
rename to .github/workflows/8.16.yml
index 52b2e67a2e..5297db43a0 100644
--- a/.github/workflows/8.x.yml
+++ b/.github/workflows/8.16.yml
@@ -1,11 +1,11 @@
-name: 8x
+name: 8.16
 on:
   push:
     branches:
-      - 8.x
+      - 8.16
   pull_request:
     branches:
-      - 8.x
+      - 8.16
 jobs:
   test-main:
     env:
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.0', '3.1', '3.2', '3.3', 'jruby-9.3', 'jruby-9.4' ]
+        ruby: ['3.1', '3.2', '3.3', 'jruby-9.3', 'jruby-9.4']
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4