diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48ef756b..00a01df1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,8 +72,8 @@ find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
 
 find_package(KF6Plasma CONFIG REQUIRED)
 find_package(KF6PlasmaQuick CONFIG REQUIRED)
-find_package(KF6Wayland CONFIG REQUIRED)
 find_package(KF6Screen CONFIG REQUIRED)
+find_package(KWayland CONFIG REQUIRED)
 
 find_package(PkgConfig REQUIRED)
 
diff --git a/components/mobileshell/CMakeLists.txt b/components/mobileshell/CMakeLists.txt
index 3d86a96e..981e3188 100644
--- a/components/mobileshell/CMakeLists.txt
+++ b/components/mobileshell/CMakeLists.txt
@@ -48,7 +48,7 @@ target_link_libraries(mobileshellplugin
         KF6::PlasmaQuick
         KF6::KIOGui
         KF6::KIOWidgets # for PreviewJob
-        KF6::WaylandClient
+        Plasma::KWaylandClient
         KF6::Service
         KF6::Package
 )
diff --git a/components/quicksettingsplugin/CMakeLists.txt b/components/quicksettingsplugin/CMakeLists.txt
index d14a1895..aebb494e 100644
--- a/components/quicksettingsplugin/CMakeLists.txt
+++ b/components/quicksettingsplugin/CMakeLists.txt
@@ -16,7 +16,7 @@ target_link_libraries(quicksettingsplugin PRIVATE
     Qt::DBus
     Qt::Gui
     Qt::Quick
-    KF6::WaylandClient
+    Plasma::KWaylandClient
     KF6::Service
     KF6::ConfigWidgets
     KF6::Package
diff --git a/components/shellsettingsplugin/CMakeLists.txt b/components/shellsettingsplugin/CMakeLists.txt
index 9aff9c0a..a408af88 100644
--- a/components/shellsettingsplugin/CMakeLists.txt
+++ b/components/shellsettingsplugin/CMakeLists.txt
@@ -9,7 +9,7 @@ target_link_libraries(shellsettingsplugin PRIVATE
     Qt::DBus
     Qt::Gui
     Qt::Quick
-    KF6::WaylandClient
+    Plasma::KWaylandClient
     KF6::Service
     KF6::ConfigWidgets
     KF6::Package
diff --git a/components/windowplugin/CMakeLists.txt b/components/windowplugin/CMakeLists.txt
index 1d63183f..cda60266 100644
--- a/components/windowplugin/CMakeLists.txt
+++ b/components/windowplugin/CMakeLists.txt
@@ -13,7 +13,7 @@ target_link_libraries(windowplugin PRIVATE
     Qt::DBus
     Qt::Gui
     Qt::Quick
-    KF6::WaylandClient
+    Plasma::KWaylandClient
     KF6::Service
     KF6::ConfigWidgets
 )
diff --git a/containments/homescreens/folio/CMakeLists.txt b/containments/homescreens/folio/CMakeLists.txt
index 13a0af80..49dfacdf 100644
--- a/containments/homescreens/folio/CMakeLists.txt
+++ b/containments/homescreens/folio/CMakeLists.txt
@@ -32,7 +32,7 @@ target_link_libraries(org.kde.plasma.mobile.homescreen.folio
                       KF6::Service
                       KF6::KIOGui
                       KF6::Notifications
-                      KF6::WaylandClient
+                      Plasma::KWaylandClient
                       KF6::WindowSystem
                       KF6::JobWidgets
 )
diff --git a/containments/homescreens/folio/plugin/CMakeLists.txt b/containments/homescreens/folio/plugin/CMakeLists.txt
index f2ed62c2..a76031ef 100644
--- a/containments/homescreens/folio/plugin/CMakeLists.txt
+++ b/containments/homescreens/folio/plugin/CMakeLists.txt
@@ -31,7 +31,7 @@ target_link_libraries(folioplugin
                       KF6::Service
                       KF6::KIOGui
                       KF6::JobWidgets
-                      KF6::WaylandClient
+                      Plasma::KWaylandClient
                       KF6::WindowSystem)
 
 set_property(TARGET folioplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/private/mobile/homescreen/folio)
diff --git a/containments/homescreens/halcyon/CMakeLists.txt b/containments/homescreens/halcyon/CMakeLists.txt
index b2852ae8..78405349 100644
--- a/containments/homescreens/halcyon/CMakeLists.txt
+++ b/containments/homescreens/halcyon/CMakeLists.txt
@@ -16,7 +16,7 @@ target_link_libraries(org.kde.plasma.mobile.homescreen.halcyon
                       KF6::Service
                       KF6::KIOGui
                       KF6::Notifications
-                      KF6::WaylandClient
+                      Plasma::KWaylandClient
                       KF6::WindowSystem
 )
 
diff --git a/containments/homescreens/halcyon/plugin/CMakeLists.txt b/containments/homescreens/halcyon/plugin/CMakeLists.txt
index 0d6d7690..d70705c9 100644
--- a/containments/homescreens/halcyon/plugin/CMakeLists.txt
+++ b/containments/homescreens/halcyon/plugin/CMakeLists.txt
@@ -23,7 +23,7 @@ target_link_libraries(halcyonplugin
                       KF6::Service
                       KF6::KIOGui
                       KF6::JobWidgets
-                      KF6::WaylandClient
+                      Plasma::KWaylandClient
                       KF6::WindowSystem)
 
 set_property(TARGET halcyonplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/private/mobile/homescreen/halcyon)