diff --git a/debian/mariadb-plugin-provider-bzip2.lintian-overrides b/debian/mariadb-plugin-provider-bzip2.lintian-overrides
index 563c05a3a6b..50e280b56da 100644
--- a/debian/mariadb-plugin-provider-bzip2.lintian-overrides
+++ b/debian/mariadb-plugin-provider-bzip2.lintian-overrides
@@ -1,3 +1,4 @@
 # It's intentional that bzip2 compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_bzip2.so
\ No newline at end of file
+library-not-linked-against-libc usr/lib/mysql/plugin/provider_bzip2.so
+library-not-linked-against-libc [usr/lib/mysql/plugin/provider_bzip2.so]
diff --git a/debian/mariadb-plugin-provider-lz4.lintian-overrides b/debian/mariadb-plugin-provider-lz4.lintian-overrides
index 3f7d7e9ecfb..4df09a0af4e 100644
--- a/debian/mariadb-plugin-provider-lz4.lintian-overrides
+++ b/debian/mariadb-plugin-provider-lz4.lintian-overrides
@@ -1,3 +1,4 @@
 # It's intentional that LZ4 compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_lz4.so
\ No newline at end of file
+library-not-linked-against-libc usr/lib/mysql/plugin/provider_lz4.so
+library-not-linked-against-libc [usr/lib/mysql/plugin/provider_lz4.so]
diff --git a/debian/mariadb-plugin-provider-lzma.lintian-overrides b/debian/mariadb-plugin-provider-lzma.lintian-overrides
index 94eafa766a4..2d9f4b8adc2 100644
--- a/debian/mariadb-plugin-provider-lzma.lintian-overrides
+++ b/debian/mariadb-plugin-provider-lzma.lintian-overrides
@@ -1,3 +1,4 @@
 # It's intentional that LZMA compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_lzma.so
\ No newline at end of file
+library-not-linked-against-libc usr/lib/mysql/plugin/provider_lzma.so
+library-not-linked-against-libc [usr/lib/mysql/plugin/provider_lzma.so]
diff --git a/debian/mariadb-plugin-provider-lzo.lintian-overrides b/debian/mariadb-plugin-provider-lzo.lintian-overrides
index 8184923cf9a..13015fde854 100644
--- a/debian/mariadb-plugin-provider-lzo.lintian-overrides
+++ b/debian/mariadb-plugin-provider-lzo.lintian-overrides
@@ -1,3 +1,4 @@
 # It's intentional that LZO compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_lzo.so
\ No newline at end of file
+library-not-linked-against-libc usr/lib/mysql/plugin/provider_lzo.so
+library-not-linked-against-libc [usr/lib/mysql/plugin/provider_lzo.so]
diff --git a/debian/mariadb-plugin-provider-snappy.lintian-overrides b/debian/mariadb-plugin-provider-snappy.lintian-overrides
index 6c76162573d..2ddf25d0dd0 100644
--- a/debian/mariadb-plugin-provider-snappy.lintian-overrides
+++ b/debian/mariadb-plugin-provider-snappy.lintian-overrides
@@ -1,3 +1,4 @@
 # It's intentional that Snappy compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_snappy.so
\ No newline at end of file
+library-not-linked-against-libc usr/lib/mysql/plugin/provider_snappy.so
+library-not-linked-against-libc [usr/lib/mysql/plugin/provider_snappy.so]
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index bb41cac9f8f..3ff96f76556 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,6 +1,6 @@
 # MariaDB use high enough debhelper so this is should
 # be considered as bug in lintia
-missing-build-dependency-for-dh-addon systemd (*)
+missing-build-dependency-for-dh-addon systemd *
 # Necessary for drop-in-place-replacement upgrades on mysql-server/-client
 # since package breaks/replaces these but at the same time also provides them
 version-substvar-for-external-package mariadb-client-core -> mysql-client-5.5
@@ -12,23 +12,11 @@ version-substvar-for-external-package mariadb-server-10.9 -> mysql-client-8.*
 version-substvar-for-external-package mariadb-client-10.9 -> mysql-client-core-5.*
 version-substvar-for-external-package mariadb-client-10.9 -> mysql-client-core-8.*
 version-substvar-for-external-package libmariadbd-dev -> libmariadbclient-dev
-# Intentional version-substvar-for-external-package as long as mariadb-server
-# provides mariadb-server-10.9 and mariadb-client provides mariadb-client-10.9
-version-substvar-for-external-package Conflicts (line 408) ${source:Version} mariadb-client -> mariadb-client-10.9
-version-substvar-for-external-package Conflicts (line 575) ${source:Version} mariadb-server-core -> mariadb-server-core-10.9
-version-substvar-for-external-package Conflicts (line 711) ${source:Version} mariadb-server -> mariadb-server-10.9
+# These are left for reason version-substvar-for-external-package 
 version-substvar-for-external-package Conflicts (line 95) ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev
 version-substvar-for-external-package Replaces (line 109) ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev
-version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-client-10.9
-version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-server-core-10.9
-version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-10.9
-version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-core-10.9
-version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-10.9
-version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-core-10.9
-version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-client-10.9
-version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-server-10.9
-version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-client-10.9
-version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-server-10.9
+version-substvar-for-external-package Conflicts ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev [*]
+version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev [*]
 # ColumnStore not used in Debian, safe to ignore. Reported upstream in https://jira.mariadb.org/browse/MDEV-24124
 source-is-missing storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2
 source-is-missing [storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2]