diff --git a/src/plugins/boot2qt/qdbplugin.cpp b/src/plugins/boot2qt/qdbplugin.cpp
index a73646b6c82..0d995ee0402 100644
--- a/src/plugins/boot2qt/qdbplugin.cpp
+++ b/src/plugins/boot2qt/qdbplugin.cpp
@@ -100,16 +100,14 @@ void registerFlashAction(QObject *parentForAction)
     toolsContainer->addAction(flashCommand, flashActionId);
 }
 
-template <class Step>
-class QdbDeployStepFactory : public ProjectExplorer::BuildStepFactory
+template <class Factory>
+class QdbDeployStepFactory : public Factory
 {
 public:
-    explicit QdbDeployStepFactory(Id id)
+    QdbDeployStepFactory()
     {
-        registerStep<Step>(id);
-        setDisplayName(Step::displayName());
-        setSupportedConfiguration(Constants::QdbDeployConfigurationId);
-        setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
+        Factory::setSupportedConfiguration(Constants::QdbDeployConfigurationId);
+        Factory::setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
     }
 };
 
@@ -125,12 +123,9 @@ public:
     QdbStopApplicationStepFactory m_stopApplicationStepFactory;
     QdbMakeDefaultAppStepFactory m_makeDefaultAppStepFactory;
 
-    QdbDeployStepFactory<RemoteLinux::GenericDirectUploadStep>
-        m_directUploadStepFactory{RemoteLinux::Constants::DirectUploadStepId};
-    QdbDeployStepFactory<RemoteLinux::RsyncDeployStep>
-        m_rsyncDeployStepFactory{RemoteLinux::Constants::RsyncDeployStepId};
-    QdbDeployStepFactory<RemoteLinux::MakeInstallStep>
-        m_makeInstallStepFactory{RemoteLinux::Constants::MakeInstallStepId};
+    QdbDeployStepFactory<RemoteLinux::GenericDirectUploadStepFactory> m_directUploadStepFactory;
+    QdbDeployStepFactory<RemoteLinux::RsyncDeployStepFactory> m_rsyncDeployStepFactory;
+    QdbDeployStepFactory<RemoteLinux::MakeInstallStepFactory> m_makeInstallStepFactory;
 
     const QList<Id> supportedRunConfigs {
         m_runConfigFactory.runConfigurationId(),
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp
index dd867d4e698..8345f76e6d7 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp
@@ -332,4 +332,12 @@ QString GenericDirectUploadStep::displayName()
     return Tr::tr("Upload files via SFTP");
 }
 
+// Factory
+
+GenericDirectUploadStepFactory::GenericDirectUploadStepFactory()
+{
+    registerStep<GenericDirectUploadStep>(Constants::DirectUploadStepId);
+    setDisplayName(Tr::tr("Upload files via SFTP"));
+}
+
 } //namespace RemoteLinux
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.h b/src/plugins/remotelinux/genericdirectuploadstep.h
index a59e89c66d6..048be324a89 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.h
+++ b/src/plugins/remotelinux/genericdirectuploadstep.h
@@ -28,4 +28,11 @@ private:
     class GenericDirectUploadStepPrivate *d;
 };
 
+class REMOTELINUX_EXPORT GenericDirectUploadStepFactory
+    : public ProjectExplorer::BuildStepFactory
+{
+public:
+    GenericDirectUploadStepFactory();
+};
+
 } // RemoteLinux
diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp
index 8f51c0b827c..83bed3a74cc 100644
--- a/src/plugins/remotelinux/makeinstallstep.cpp
+++ b/src/plugins/remotelinux/makeinstallstep.cpp
@@ -281,4 +281,12 @@ bool MakeInstallStep::fromMap(const QVariantMap &map)
     return true;
 }
 
-} // namespace RemoteLinux
+// Factory
+
+MakeInstallStepFactory::MakeInstallStepFactory()
+{
+    registerStep<MakeInstallStep>(Constants::MakeInstallStepId);
+    setDisplayName(Tr::tr("Install into temporary host directory"));
+}
+
+} // RemoteLinux
diff --git a/src/plugins/remotelinux/makeinstallstep.h b/src/plugins/remotelinux/makeinstallstep.h
index ec2fc3985a2..012a9924cf6 100644
--- a/src/plugins/remotelinux/makeinstallstep.h
+++ b/src/plugins/remotelinux/makeinstallstep.h
@@ -41,4 +41,11 @@ private:
     bool m_isCmakeProject = false;
 };
 
+class REMOTELINUX_EXPORT MakeInstallStepFactory
+    : public ProjectExplorer::BuildStepFactory
+{
+public:
+    MakeInstallStepFactory();
+};
+
 } // namespace RemoteLinux
diff --git a/src/plugins/remotelinux/rsyncdeploystep.cpp b/src/plugins/remotelinux/rsyncdeploystep.cpp
index b81914b072b..1dd46cbc286 100644
--- a/src/plugins/remotelinux/rsyncdeploystep.cpp
+++ b/src/plugins/remotelinux/rsyncdeploystep.cpp
@@ -137,4 +137,12 @@ QString RsyncDeployStep::displayName()
     return Tr::tr("Deploy files via rsync");
 }
 
+// Factory
+
+RsyncDeployStepFactory::RsyncDeployStepFactory()
+{
+    registerStep<RsyncDeployStep>(Constants::RsyncDeployStepId);
+    setDisplayName(Tr::tr("Deploy files via rsync"));
+}
+
 } // RemoteLinux
diff --git a/src/plugins/remotelinux/rsyncdeploystep.h b/src/plugins/remotelinux/rsyncdeploystep.h
index 1cbd2edee38..eb6ac41d6d4 100644
--- a/src/plugins/remotelinux/rsyncdeploystep.h
+++ b/src/plugins/remotelinux/rsyncdeploystep.h
@@ -33,4 +33,11 @@ private:
     QString m_flags;
 };
 
+class REMOTELINUX_EXPORT RsyncDeployStepFactory
+    : public ProjectExplorer::BuildStepFactory
+{
+public:
+    RsyncDeployStepFactory();
+};
+
 } // namespace RemoteLinux