diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4b2418f1d..77ba048c6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -192,7 +192,7 @@ set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
     QT_QML_SINGLETON_TYPE TRUE
 )
 
-qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
+ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat
     QML_FILES
         qml/Main.qml
diff --git a/src/chatbar/CMakeLists.txt b/src/chatbar/CMakeLists.txt
index d49a9bb9d..d977fbfa1 100644
--- a/src/chatbar/CMakeLists.txt
+++ b/src/chatbar/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 qt_add_library(chatbar STATIC)
-qt_add_qml_module(chatbar
+ecm_add_qml_module(chatbar GENERATE_PLUGIN_SOURCE
     URI org.kde.neochat.chatbar
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/chatbar
     QML_FILES
diff --git a/src/devtools/CMakeLists.txt b/src/devtools/CMakeLists.txt
index a2c8afbeb..ae53d93dd 100644
--- a/src/devtools/CMakeLists.txt
+++ b/src/devtools/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 qt_add_library(devtools STATIC)
-qt_add_qml_module(devtools
+ecm_add_qml_module(devtools GENERATE_PLUGIN_SOURCE
     URI org.kde.neochat.devtools
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/devtools
     QML_FILES
diff --git a/src/login/CMakeLists.txt b/src/login/CMakeLists.txt
index 36f1d3a99..9738e40a6 100644
--- a/src/login/CMakeLists.txt
+++ b/src/login/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 qt_add_library(login STATIC)
-qt_add_qml_module(login
+ecm_add_qml_module(login GENERATE_PLUGIN_SOURCE
     URI org.kde.neochat.login
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/login
     QML_FILES
diff --git a/src/purpose/CMakeLists.txt b/src/purpose/CMakeLists.txt
index d501be811..567797cc5 100644
--- a/src/purpose/CMakeLists.txt
+++ b/src/purpose/CMakeLists.txt
@@ -1,8 +1,8 @@
 # SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
 # SPDX-License-Identifier: BSD-2-Clause
 
-kcoreaddons_add_plugin(neochatplugin SOURCES purposeplugin.cpp INSTALL_NAMESPACE "kf6/purpose")
-target_link_libraries(neochatplugin
+kcoreaddons_add_plugin(neochatshareplugin SOURCES purposeplugin.cpp INSTALL_NAMESPACE "kf6/purpose")
+target_link_libraries(neochatshareplugin
     Qt::DBus
     KF6::Purpose
     KF6::KIOGui
diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt
index b63502b56..60f73cf79 100644
--- a/src/settings/CMakeLists.txt
+++ b/src/settings/CMakeLists.txt
@@ -10,7 +10,7 @@ set_source_files_properties(
         QT_QML_SINGLETON_TYPE TRUE
 )
 
-qt_add_qml_module(settings
+ecm_add_qml_module(settings GENERATE_PLUGIN_SOURCE
     URI org.kde.neochat.settings
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/settings
     QML_FILES
diff --git a/src/timeline/CMakeLists.txt b/src/timeline/CMakeLists.txt
index 30e194a91..f1ceb7946 100644
--- a/src/timeline/CMakeLists.txt
+++ b/src/timeline/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 qt_add_library(timeline STATIC)
-qt_add_qml_module(timeline
+ecm_add_qml_module(timeline GENERATE_PLUGIN_SOURCE
     URI org.kde.neochat.timeline
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/timeline
     QML_FILES