diff --git a/.github/hibernate-github-bot.yml b/.github/hibernate-github-bot.yml
index 71915f9ac7..c66e581a7d 100644
--- a/.github/hibernate-github-bot.yml
+++ b/.github/hibernate-github-bot.yml
@@ -53,7 +53,7 @@ develocity:
         pattern: "s390x"
         replacement: "$1"
       - column: "DB"
-        pattern: "(h2|postgres(?:ql)?|pgsql|mysql|mariadb|mssql|derby|tidb|cockroach(?:db)?|oracle|db2|hsqldb|edb|sybase)(?:(.*)_ci|(.*))"
-        replacement: "$1$2$3"
+        pattern: "((?:h2|postgres(?:ql)?|pgsql|mysql|mariadb|mssql|derby|tidb|cockroach(?:db)?|oracle|db2|hsqldb|edb|sybase)(?:.*(?=_ci)|.*))(?:_ci)?"
+        replacement: "$1"
       - pattern: "main|HEAD|\\d+.\\d+|PR-\\d+"
         replacement: "" # Just remove these tags
\ No newline at end of file