diff --git a/.github/json_matrices/build-matrix.json b/.github/json_matrices/build-matrix.json
index c3f358a082..5e10c38a37 100644
--- a/.github/json_matrices/build-matrix.json
+++ b/.github/json_matrices/build-matrix.json
@@ -16,8 +16,7 @@
         "ARCH": "arm64",
         "TARGET": "aarch64-unknown-linux-gnu",
         "PACKAGE_MANAGERS": ["pypi", "npm", "maven"],
-        "languages": ["python", "node", "java", "go", "dotnet"],
-        "CONTAINER": "2_28"
+        "languages": ["python", "node", "java", "go", "dotnet"]
     },
     {
         "OS": "macos",
diff --git a/.github/workflows/pypi-cd.yml b/.github/workflows/pypi-cd.yml
index 11d2cc9378..2c29345515 100644
--- a/.github/workflows/pypi-cd.yml
+++ b/.github/workflows/pypi-cd.yml
@@ -154,7 +154,7 @@ jobs:
                   target: ${{ matrix.build.TARGET }}
                   args: --release --strip --out wheels -i ${{ github.event_name != 'pull_request' && 'python3.8 python3.9 python3.10 python3.11 python3.12 python3.13' || 'python3.12' }}
                   manylinux: auto
-                  container: ${{ matrix.build.CONTAINER != '' && matrix.build.CONTAINER || '2014' }}
+                  container: ${{ contains(matrix.build.RUNNER, 'self-hosted') && '2_28' || '2014' }}
                   before-script-linux: |
                       # Install protobuf compiler
                       if [[ $(`which apt`) != '' ]]