diff --git a/.github/matrix-commitly.yml b/.github/matrix-commitly.yml
index 541eaed6869b..71eb2b00753a 100644
--- a/.github/matrix-commitly.yml
+++ b/.github/matrix-commitly.yml
@@ -5,49 +5,6 @@ build-packages:
 # package-type: the nfpm packaging target, //:kong_{package} target; only used when package is rpm
 # bazel-args: additional bazel build flags
 # check-manifest-suite: the check manifest suite as defined in scripts/explain_manifest/config.py
-
-# Ubuntu
-- label: ubuntu-20.04
-  image: ubuntu:20.04
-  package: deb
-  check-manifest-suite: ubuntu-20.04-amd64
-- label: ubuntu-22.04
-  image: ubuntu:22.04
-  package: deb
-  check-manifest-suite: ubuntu-22.04-amd64
-- label: ubuntu-22.04-arm64
-  image: ubuntu:22.04
-  package: deb
-  bazel-args: --platforms=//:generic-crossbuild-aarch64
-  check-manifest-suite: ubuntu-22.04-arm64
-
-# Debian
-- label: debian-11
-  image: debian:11
-  package: deb
-  check-manifest-suite: debian-11-amd64
-- label: debian-12
-  image: debian:12
-  package: deb
-  check-manifest-suite: debian-12-amd64
-
-# RHEL
-- label: rhel-8
-  image: rockylinux:8
-  package: rpm
-  package-type: el8
-  check-manifest-suite: el8-amd64
-- label: rhel-9
-  image: rockylinux:9
-  package: rpm
-  package-type: el9
-  check-manifest-suite: el9-amd64
-- label: rhel-9-arm64
-  package: rpm
-  package-type: el9
-  bazel-args: --platforms=//:rhel9-crossbuild-aarch64 --//:brotli=False
-  check-manifest-suite: el9-arm64
-
   # Amazon Linux
 - label: amazonlinux-2
   package: rpm
@@ -55,16 +12,6 @@ build-packages:
   check-manifest-suite: amazonlinux-2-amd64
   # ada and simdjson don't compile on gcc7.3.1 (needs 7.4)
   bazel-args: --platforms=//:aws2-crossbuild-x86_64 --//:simdjson=False --//:ada=False
-- label: amazonlinux-2023
-  image: amazonlinux:2023
-  package: rpm
-  package-type: aws2023
-  check-manifest-suite: amazonlinux-2023-amd64
-- label: amazonlinux-2023-arm64
-  package: rpm
-  package-type: aws2023
-  bazel-args: --platforms=//:aws2023-crossbuild-aarch64 --//:brotli=False
-  check-manifest-suite: amazonlinux-2023-arm64
 
 build-images:
 # Only build images for the latest version of each major release.
diff --git a/build/BUILD.bazel b/build/BUILD.bazel
index 6b2e872a2406..9e48ade65266 100644
--- a/build/BUILD.bazel
+++ b/build/BUILD.bazel
@@ -17,7 +17,7 @@ exports_files([
         strip_path = "snappy" if k == "@snappy" else "ada" if k == "@ada" else "",
     )
     for k in get_clib_deps(select({
-        "@kong//:ada_flag": True,
+        "@kong//:ada": True,
         "//conditions:default": False,
     }))
 ]
@@ -27,7 +27,7 @@ kong_rules_group(
     propagates = [
         ":install-%s" % get_workspace_name(k)
         for k in get_clib_deps(select({
-            "@kong//:ada_flag": True,
+            "@kong//:ada": True,
             "//conditions:default": False,
         }))
     ],