diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30e1fc3..427bf55 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
-# SPDX-FileCopyrightText: Nonea
+# SPDX-FileCopyrightText: None
 # SPDX-License-Identifier: CC0-1.0
 
 include:
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4f77b5..575ee63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,11 @@ include(KDECompilerSettings NO_POLICY_SCOPE)
 include(FeatureSummary)
 include(GenerateExportHeader)
 
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+if (NOT QT_MAJOR_VERSION)
+    set(QT_MAJOR_VERSION "5")
+endif()
+
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
   Core
   Gui
   Widgets
@@ -57,7 +61,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
     DocTools
 )
 
-find_package(PolkitQt5-1 REQUIRED)
+find_package(PolkitQt${QT_MAJOR_VERSION}-1 REQUIRED)
 
 # use sane compile flags
 add_definitions(
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2f37d1e..4be6fbc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,13 +21,13 @@ file(GLOB partitionmanager_UIFILES config/*.ui gui/*.ui)
 ki18n_wrap_ui(partitionmanager_SRCS ${partitionmanager_UIFILES})
 
 kconfig_add_kcfg_files(partitionmanager_SRCS config.kcfgc)
-install(FILES partitionmanager.kcfg DESTINATION ${KCFG_INSTALL_DIR})
+install(FILES partitionmanager.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
 
 ############################################
 
 add_executable(partitionmanager ${partitionmanager_SRCS} )
 
-target_link_libraries(partitionmanager ${BLKID_LIBRARIES}
+target_link_libraries(partitionmanager
 	kpmcore
 	KF5::ConfigCore
 	KF5::ConfigGui
@@ -40,7 +40,7 @@ target_link_libraries(partitionmanager ${BLKID_LIBRARIES}
 	KF5::KIOWidgets
 	KF5::WidgetsAddons
 	KF5::XmlGui
-	PolkitQt5-1::Core
+	PolkitQt${QT_MAJOR_VERSION}-1::Core
 )
 
 target_compile_definitions(partitionmanager PRIVATE -DCMAKE_INSTALL_FULL_LIBEXECDIR_KF5=\"${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}\")
@@ -48,7 +48,7 @@ target_compile_definitions(partitionmanager PRIVATE -DCMAKE_INSTALL_FULL_LIBEXEC
 install(TARGETS partitionmanager ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES org.kde.partitionmanager.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 install(FILES gui/partitionmanagerui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/partitionmanager)
-install(PROGRAMS org.kde.partitionmanager.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(PROGRAMS org.kde.partitionmanager.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 
 ############################################