diff --git a/.github/workflows/ci.bazelrc b/.github/workflows/ci.bazelrc
index 93d39ccdd..1779978ab 100644
--- a/.github/workflows/ci.bazelrc
+++ b/.github/workflows/ci.bazelrc
@@ -2,10 +2,6 @@
 common:local --disk_cache=~/.cache/bazel-disk-cache
 common --repository_cache=~/.cache/bazel-repository-cache
 
-# Bazel version specific settings
-common:bazel6 --test_tag_filters=-skip-on-bazel6
-common:bazel7 --test_tag_filters=-skip-on-bazel7
-
 # Bazel-in-bazel support
 test --test_env=XDG_CACHE_HOME
 
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 049f60a55..c875c750c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -283,7 +283,8 @@ jobs:
                     --bazelrc=${GITHUB_WORKSPACE//\\/\/}/.github/workflows/ci.bazelrc \
                     test \
                     --config=${{ matrix.config }} \
-                    --config=bazel${{ matrix.bazel-version.major }} \
+                    --test_tag_filters=-skip-on-${{ matrix.config }},-skip-on-bazel${{ matrix.bazel-version.major }} \
+                    --build_tag_filters=-skip-on-${{ matrix.config }},-skip-on-bazel${{ matrix.bazel-version.major }} \
                     --enable_bzlmod=${{ matrix.bzlmod }} \
                     //...
               env: