diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0490935e9..51c69861f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,11 @@
 # SPDX-FileCopyrightText: 2020-2021 Laurent Montel <montel@kde.org>
 # SPDX-License-Identifier: CC0-1.0
 
 include:
   - project: sysadmin/ci-utilities
     file:
       - /gitlab-templates/linux-qt6.yml
       - /gitlab-templates/freebsd-qt6.yml
       - /gitlab-templates/flatpak.yml
+      - /gitlab-templates/cppcheck.yml
+      - /gitlab-templates/xml-lint.yml
diff --git a/.kde-ci.yml b/.kde-ci.yml
index 26f3f82f6..da4d68bb3 100644
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -1,29 +1,31 @@
 # SPDX-FileCopyrightText: None
 # SPDX-License-Identifier: CC0-1.0
 
 Dependencies:
 - 'on': ['Linux', 'FreeBSD', 'Windows']
   'require':
     'frameworks/extra-cmake-modules': '@latest-kf6'
     'pim/kmime' : '@same'
     'pim/libkleo' : '@same'
     'pim/kidentitymanagement' : '@same'
     'pim/kmailtransport' : '@same'
     'frameworks/kcmutils': '@latest-kf6'
     'frameworks/kcodecs': '@latest-kf6'
     'frameworks/kconfig': '@latest-kf6'
     'frameworks/kconfigwidgets': '@latest-kf6'
     'frameworks/kcoreaddons': '@latest-kf6'
     'frameworks/kcrash': '@latest-kf6'
     'frameworks/ki18n': '@latest-kf6'
     'frameworks/kiconthemes': '@latest-kf6'
     'frameworks/kitemmodels': '@latest-kf6'
     'frameworks/kio': '@latest-kf6'
     'frameworks/kwidgetsaddons': '@latest-kf6'
     'frameworks/kwindowsystem': '@latest-kf6'
     'frameworks/kxmlgui': '@latest-kf6'
     'frameworks/kstatusnotifieritem': '@latest-kf6'
     'pim/mimetreeparser' : '@same'
 
 Options:
   require-passing-tests-on: [ 'Linux', 'FreeBSD' ]      
+  xml-validate-include:
+   - src/kleopatra.w32-manifest.in