diff --git a/containmentactions/applauncher/CMakeLists.txt b/containmentactions/applauncher/CMakeLists.txt
index 084ec2897..0a63f066b 100644
--- a/containmentactions/applauncher/CMakeLists.txt
+++ b/containmentactions/applauncher/CMakeLists.txt
@@ -1,15 +1,14 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_containmentactions_applauncher\")
 
 set(applauncher_SRCS
     launch.cpp
 )
 ki18n_wrap_ui(applauncher_SRCS config.ui)
 
 add_library(plasma_containmentactions_applauncher MODULE ${applauncher_SRCS})
 
 kcoreaddons_desktop_to_json(plasma_containmentactions_applauncher plasma-containmentactions-applauncher.desktop)
 
 target_link_libraries(plasma_containmentactions_applauncher KF5::Plasma KF5::KIOCore KF5::KIOWidgets KF5::I18n)
 
-install(TARGETS plasma_containmentactions_applauncher DESTINATION ${KDE_INSTALL_PLUGINDIR})
-install(FILES plasma-containmentactions-applauncher.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(TARGETS plasma_containmentactions_applauncher DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/containmentactions)
diff --git a/containmentactions/contextmenu/CMakeLists.txt b/containmentactions/contextmenu/CMakeLists.txt
index b7d1d2722..9fdcb3f60 100644
--- a/containmentactions/contextmenu/CMakeLists.txt
+++ b/containmentactions/contextmenu/CMakeLists.txt
@@ -1,29 +1,28 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_containmentactions_contextmenu\")
 
 include_directories(${plasma-workspace_SOURCE_DIR}/libkworkspace)
 
 set(contextmenu_SRCS
     menu.cpp
 )
 
 set(krunner_xml ${plasma-workspace_SOURCE_DIR}/krunner/dbus/org.kde.krunner.App.xml)
 qt5_add_dbus_interface(contextmenu_SRCS ${krunner_xml} krunner_interface)
 
 qt5_add_dbus_interface(contextmenu_SRCS ${SCREENSAVER_DBUS_INTERFACE} screensaver_interface)
 
 
 add_library(plasma_containmentactions_contextmenu MODULE ${contextmenu_SRCS})
 
 kcoreaddons_desktop_to_json(plasma_containmentactions_contextmenu plasma-containmentactions-contextmenu.desktop)
 
 target_link_libraries(plasma_containmentactions_contextmenu
                       Qt5::DBus
                       KF5::I18n
                       KF5::GlobalAccel
                       KF5::Plasma
                       KF5::XmlGui
                       KF5::KIOCore
                       PW::KWorkspace)
 
-install(TARGETS plasma_containmentactions_contextmenu DESTINATION ${KDE_INSTALL_PLUGINDIR})
-install(FILES plasma-containmentactions-contextmenu.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(TARGETS plasma_containmentactions_contextmenu DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/containmentactions)
diff --git a/containmentactions/paste/CMakeLists.txt b/containmentactions/paste/CMakeLists.txt
index aafe4fc8d..cffd54b40 100644
--- a/containmentactions/paste/CMakeLists.txt
+++ b/containmentactions/paste/CMakeLists.txt
@@ -1,16 +1,11 @@
-set(paste_SRCS
-    paste.cpp
-)
-
-add_library(plasma_containmentactions_paste MODULE ${paste_SRCS})
+add_library(plasma_containmentactions_paste MODULE paste.cpp)
 target_link_libraries(plasma_containmentactions_paste
     Qt5::Gui
     Qt5::Widgets
     KF5::Plasma
     KF5::KIOCore
-    )
+)
 
 kcoreaddons_desktop_to_json(plasma_containmentactions_paste plasma-containmentactions-paste.desktop)
 
-install(TARGETS plasma_containmentactions_paste DESTINATION ${KDE_INSTALL_PLUGINDIR})
-install(FILES plasma-containmentactions-paste.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(TARGETS plasma_containmentactions_paste DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/containmentactions)
diff --git a/containmentactions/switchdesktop/CMakeLists.txt b/containmentactions/switchdesktop/CMakeLists.txt
index a3c93b6e7..8635b3d43 100644
--- a/containmentactions/switchdesktop/CMakeLists.txt
+++ b/containmentactions/switchdesktop/CMakeLists.txt
@@ -1,16 +1,14 @@
 set(switchdesktop_SRCS
     desktop.cpp
 )
 
 add_library(plasma_containmentactions_switchdesktop MODULE ${switchdesktop_SRCS})
 
 kcoreaddons_desktop_to_json(plasma_containmentactions_switchdesktop plasma-containmentactions-switchdesktop.desktop)
 
 target_link_libraries(plasma_containmentactions_switchdesktop
                         Qt5::Widgets
                         KF5::Plasma
                         PW::LibTaskManager
                        )
-
-install(TARGETS plasma_containmentactions_switchdesktop DESTINATION ${KDE_INSTALL_PLUGINDIR})
-install(FILES plasma-containmentactions-switchdesktop.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(TARGETS plasma_containmentactions_switchdesktop DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/containmentactions)
diff --git a/containmentactions/switchwindow/CMakeLists.txt b/containmentactions/switchwindow/CMakeLists.txt
index 50555d1aa..7e9224640 100644
--- a/containmentactions/switchwindow/CMakeLists.txt
+++ b/containmentactions/switchwindow/CMakeLists.txt
@@ -1,19 +1,18 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_containmentactions_switchwindow\")
 
 set(switchwindow_SRCS
     switch.cpp
 )
 ki18n_wrap_ui(switchwindow_SRCS config.ui)
 
 add_library(plasma_containmentactions_switchwindow MODULE ${switchwindow_SRCS})
 
 kcoreaddons_desktop_to_json(plasma_containmentactions_switchwindow plasma-containmentactions-switchwindow.desktop)
 
 target_link_libraries(plasma_containmentactions_switchwindow
                       Qt5::Widgets
                       KF5::Plasma
                       KF5::I18n
                       PW::LibTaskManager)
 
-install(TARGETS plasma_containmentactions_switchwindow DESTINATION ${KDE_INSTALL_PLUGINDIR})
-install(FILES plasma-containmentactions-switchwindow.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(TARGETS plasma_containmentactions_switchwindow DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/containmentactions)