diff --git a/kded/service.cpp b/kded/service.cpp
--- a/kded/service.cpp
+++ b/kded/service.cpp
@@ -36,9 +36,7 @@
 #include <QDBusConnectionInterface>
 #include <QDBusReply>
 
-K_PLUGIN_FACTORY_WITH_JSON(NetworkManagementServiceFactory,
-                           "networkmanagement.json",
-                           registerPlugin<NetworkManagementService>();)
+K_PLUGIN_CLASS_WITH_JSON(NetworkManagementService, "networkmanagement.json")
 
 class NetworkManagementServicePrivate
 {
diff --git a/mobile/broadband/mobilebroadbandsettings.cpp b/mobile/broadband/mobilebroadbandsettings.cpp
--- a/mobile/broadband/mobilebroadbandsettings.cpp
+++ b/mobile/broadband/mobilebroadbandsettings.cpp
@@ -33,7 +33,7 @@
 #include <ModemManagerQt/ModemDevice>
 #endif
 
-K_PLUGIN_FACTORY_WITH_JSON(MobileBroadbandSettingsFactory, "mobilebroadbandsettings.json", registerPlugin<MobileBroadbandSettings>();)
+K_PLUGIN_CLASS_WITH_JSON(MobileBroadbandSettings, "mobilebroadbandsettings.json")
 
 MobileBroadbandSettings::MobileBroadbandSettings(QObject* parent, const QVariantList& args) : KQuickAddons::ConfigModule(parent, args)
 {
diff --git a/mobile/wifi/wifisettings.cpp b/mobile/wifi/wifisettings.cpp
--- a/mobile/wifi/wifisettings.cpp
+++ b/mobile/wifi/wifisettings.cpp
@@ -38,7 +38,7 @@
 #include <NetworkManagerQt/WirelessSetting>
 
 
-K_PLUGIN_FACTORY_WITH_JSON(WifiSettingsFactory, "wifisettings.json", registerPlugin<WifiSettings>();)
+K_PLUGIN_CLASS_WITH_JSON(WifiSettings, "wifisettings.json")
 
 WifiSettings::WifiSettings(QObject* parent, const QVariantList& args) : KQuickAddons::ConfigModule(parent, args)
 {
diff --git a/vpn/fortisslvpn/fortisslvpn.cpp b/vpn/fortisslvpn/fortisslvpn.cpp
--- a/vpn/fortisslvpn/fortisslvpn.cpp
+++ b/vpn/fortisslvpn/fortisslvpn.cpp
@@ -24,7 +24,7 @@
 
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY_WITH_JSON(FortisslvpnUiPluginFactory, "plasmanetworkmanagement_fortisslvpnui.json", registerPlugin<FortisslvpnUiPlugin>(); )
+K_PLUGIN_CLASS_WITH_JSON(FortisslvpnUiPlugin, "plasmanetworkmanagement_fortisslvpnui.json")
 
 FortisslvpnUiPlugin::FortisslvpnUiPlugin(QObject *parent, const QVariantList &)
     : VpnUiPlugin(parent)
diff --git a/vpn/iodine/iodine.cpp b/vpn/iodine/iodine.cpp
--- a/vpn/iodine/iodine.cpp
+++ b/vpn/iodine/iodine.cpp
@@ -24,7 +24,7 @@
 
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY_WITH_JSON(IodineUiPluginFactory, "plasmanetworkmanagement_iodineui.json", registerPlugin<IodineUiPlugin>(); )
+K_PLUGIN_CLASS_WITH_JSON(IodineUiPlugin, "plasmanetworkmanagement_iodineui.json")
 
 IodineUiPlugin::IodineUiPlugin(QObject *parent, const QVariantList &)
     : VpnUiPlugin(parent)
diff --git a/vpn/l2tp/l2tp.cpp b/vpn/l2tp/l2tp.cpp
--- a/vpn/l2tp/l2tp.cpp
+++ b/vpn/l2tp/l2tp.cpp
@@ -27,7 +27,7 @@
 #include "l2tpwidget.h"
 #include "l2tpauth.h"
 
-K_PLUGIN_FACTORY_WITH_JSON(L2tpUiPluginFactory, "plasmanetworkmanagement_l2tpui.json", registerPlugin<L2tpUiPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(L2tpUiPlugin, "plasmanetworkmanagement_l2tpui.json")
 
 L2tpUiPlugin::L2tpUiPlugin(QObject * parent, const QVariantList &)
     : VpnUiPlugin(parent)
diff --git a/vpn/openswan/openswan.cpp b/vpn/openswan/openswan.cpp
--- a/vpn/openswan/openswan.cpp
+++ b/vpn/openswan/openswan.cpp
@@ -25,7 +25,7 @@
 #include "openswanwidget.h"
 #include "openswanauth.h"
 
-K_PLUGIN_FACTORY_WITH_JSON(OpenswanUiPluginFactory, "plasmanetworkmanagement_openswanui.json", registerPlugin<OpenswanUiPlugin>(); )
+K_PLUGIN_CLASS_WITH_JSON(OpenswanUiPlugin, "plasmanetworkmanagement_openswanui.json")
 
 OpenswanUiPlugin::OpenswanUiPlugin(QObject * parent, const QVariantList &)
     : VpnUiPlugin(parent)
diff --git a/vpn/openvpn/openvpn.cpp b/vpn/openvpn/openvpn.cpp
--- a/vpn/openvpn/openvpn.cpp
+++ b/vpn/openvpn/openvpn.cpp
@@ -42,7 +42,7 @@
 
 #include "nm-openvpn-service.h"
 
-K_PLUGIN_FACTORY_WITH_JSON(OpenVpnUiPluginFactory, "plasmanetworkmanagement_openvpnui.json", registerPlugin<OpenVpnUiPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(OpenVpnUiPlugin, "plasmanetworkmanagement_openvpnui.json")
 
 #define AUTH_TAG "auth"
 #define AUTH_USER_PASS_TAG "auth-user-pass"
diff --git a/vpn/pptp/pptp.cpp b/vpn/pptp/pptp.cpp
--- a/vpn/pptp/pptp.cpp
+++ b/vpn/pptp/pptp.cpp
@@ -26,7 +26,7 @@
 #include "pptpwidget.h"
 #include "pptpauth.h"
 
-K_PLUGIN_FACTORY_WITH_JSON(PptpUiPluginFactory, "plasmanetworkmanagement_pptpui.json", registerPlugin<PptpUiPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(PptpUiPlugin, "plasmanetworkmanagement_pptpui.json")
 
 PptpUiPlugin::PptpUiPlugin(QObject * parent, const QVariantList &)
     : VpnUiPlugin(parent)
diff --git a/vpn/ssh/ssh.cpp b/vpn/ssh/ssh.cpp
--- a/vpn/ssh/ssh.cpp
+++ b/vpn/ssh/ssh.cpp
@@ -24,7 +24,7 @@
 
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY_WITH_JSON(SshUiPluginFactory, "plasmanetworkmanagement_sshui.json", registerPlugin<SshUiPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(SshUiPlugin, "plasmanetworkmanagement_sshui.json")
 
 SshUiPlugin::SshUiPlugin(QObject * parent, const QVariantList &)
     : VpnUiPlugin(parent)
diff --git a/vpn/sstp/sstp.cpp b/vpn/sstp/sstp.cpp
--- a/vpn/sstp/sstp.cpp
+++ b/vpn/sstp/sstp.cpp
@@ -24,7 +24,7 @@
 
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY_WITH_JSON(SstpUiPluginFactory, "plasmanetworkmanagement_sstpui.json", registerPlugin<SstpUiPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(SstpUiPlugin, "plasmanetworkmanagement_sstpui.json")
 
 SstpUiPlugin::SstpUiPlugin(QObject *parent, const QVariantList &)
     : VpnUiPlugin(parent)
diff --git a/vpn/strongswan/strongswan.cpp b/vpn/strongswan/strongswan.cpp
--- a/vpn/strongswan/strongswan.cpp
+++ b/vpn/strongswan/strongswan.cpp
@@ -26,7 +26,7 @@
 
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY_WITH_JSON(StrongswanUiPluginFactory, "plasmanetworkmanagement_strongswanui.json", registerPlugin<StrongswanUiPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(StrongswanUiPlugin, "plasmanetworkmanagement_strongswanui.json")
 
 StrongswanUiPlugin::StrongswanUiPlugin(QObject * parent, const QVariantList &)
     : VpnUiPlugin(parent)
diff --git a/vpn/vpnc/vpnc.cpp b/vpn/vpnc/vpnc.cpp
--- a/vpn/vpnc/vpnc.cpp
+++ b/vpn/vpnc/vpnc.cpp
@@ -94,7 +94,7 @@
 
 #define NM_VPNC_LOCAL_PORT_DEFAULT 500
 
-K_PLUGIN_FACTORY_WITH_JSON(VpncUiPluginFactory, "plasmanetworkmanagement_vpncui.json", registerPlugin<VpncUiPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(VpncUiPlugin, "plasmanetworkmanagement_vpncui.json")
 
 VpncUiPlugin::VpncUiPlugin(QObject * parent, const QVariantList &)
     : VpnUiPlugin(parent)
diff --git a/vpn/wireguard/wireguard.cpp b/vpn/wireguard/wireguard.cpp
--- a/vpn/wireguard/wireguard.cpp
+++ b/vpn/wireguard/wireguard.cpp
@@ -39,7 +39,7 @@
 
 #include "nm-wireguard-service.h"
 
-K_PLUGIN_FACTORY_WITH_JSON(WireGuardUiPluginFactory, "plasmanetworkmanagement_wireguardui.json", registerPlugin<WireGuardUiPlugin>(); )
+K_PLUGIN_CLASS_WITH_JSON(WireGuardUiPlugin, "plasmanetworkmanagement_wireguardui.json")
 
 #define NMV_WG_TAG_INTERFACE             "Interface"
 #define NMV_WG_TAG_PRIVATE_KEY           "PrivateKey"