diff --git a/src/plugins/boot2qt/qdbdeployconfigurationfactory.cpp b/src/plugins/boot2qt/qdbdeployconfigurationfactory.cpp
index 0462436bf6a..a8b86a87ffd 100644
--- a/src/plugins/boot2qt/qdbdeployconfigurationfactory.cpp
+++ b/src/plugins/boot2qt/qdbdeployconfigurationfactory.cpp
@@ -26,20 +26,15 @@
 #include "qdbdeployconfigurationfactory.h"
 
 #include "qdbconstants.h"
-#include "qdbstopapplicationstep.h"
 
 #include <projectexplorer/deploymentdataview.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
 
-#include <remotelinux/genericdirectuploadstep.h>
-#include <remotelinux/makeinstallstep.h>
-#include <remotelinux/remotelinuxcheckforfreediskspacestep.h>
-#include <remotelinux/remotelinuxdeployconfiguration.h>
+#include <remotelinux/remotelinux_constants.h>
 
 using namespace ProjectExplorer;
-using namespace RemoteLinux;
 
 namespace Qdb {
 namespace Internal {
@@ -52,14 +47,14 @@ QdbDeployConfigurationFactory::QdbDeployConfigurationFactory()
                                                       "Deploy to Boot2Qt target"));
     setUseDeploymentDataView();
 
-    addInitialStep(RemoteLinux::MakeInstallStep::stepId(), [](Target *target) {
+    addInitialStep(RemoteLinux::Constants::MakeInstallStepId, [](Target *target) {
         const Project * const prj = target->project();
         return prj->deploymentKnowledge() == DeploymentKnowledge::Bad
                 && prj->hasMakeInstallEquivalent();
     });
-    addInitialStep(RemoteLinuxCheckForFreeDiskSpaceStep::stepId());
+    addInitialStep(RemoteLinux::Constants::CheckForFreeDiskSpaceId);
     addInitialStep(Qdb::Constants::QdbStopApplicationStepId);
-    addInitialStep(GenericDirectUploadStep::stepId());
+    addInitialStep(RemoteLinux::Constants::DirectUploadStepId);
 }
 
 } // namespace Internal
diff --git a/src/plugins/boot2qt/qdbplugin.cpp b/src/plugins/boot2qt/qdbplugin.cpp
index 49aebc378df..cf6f67ebbdc 100644
--- a/src/plugins/boot2qt/qdbplugin.cpp
+++ b/src/plugins/boot2qt/qdbplugin.cpp
@@ -45,9 +45,10 @@
 
 #include <qtsupport/qtversionfactory.h>
 
-#include <remotelinux/remotelinuxcheckforfreediskspacestep.h>
 #include <remotelinux/genericdirectuploadstep.h>
 #include <remotelinux/makeinstallstep.h>
+#include <remotelinux/remotelinuxcheckforfreediskspacestep.h>
+#include <remotelinux/remotelinux_constants.h>
 
 #include <utils/hostosinfo.h>
 #include <utils/fileutils.h>
@@ -154,9 +155,9 @@ template <class Step>
 class QdbDeployStepFactory : public ProjectExplorer::BuildStepFactory
 {
 public:
-    QdbDeployStepFactory()
+    explicit QdbDeployStepFactory(Core::Id id)
     {
-        registerStep<Step>(Step::stepId());
+        registerStep<Step>(id);
         setDisplayName(Step::displayName());
         setSupportedConfiguration(Constants::QdbDeployConfigurationId);
         setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
@@ -176,9 +177,11 @@ public:
     QdbMakeDefaultAppStepFactory m_makeDefaultAppStepFactory;
 
     QdbDeployStepFactory<RemoteLinux::RemoteLinuxCheckForFreeDiskSpaceStep>
-        m_checkForFreeDiskSpaceStepFactory;
-    QdbDeployStepFactory<RemoteLinux::GenericDirectUploadStep> m_directUploadStepFactory;
-    QdbDeployStepFactory<RemoteLinux::MakeInstallStep> m_makeInstallStepFactory;
+        m_checkForFreeDiskSpaceStepFactory{RemoteLinux::Constants::CheckForFreeDiskSpaceId};
+    QdbDeployStepFactory<RemoteLinux::GenericDirectUploadStep>
+        m_directUploadStepFactory{RemoteLinux::Constants::DirectUploadStepId};
+    QdbDeployStepFactory<RemoteLinux::MakeInstallStep>
+        m_makeInstallStepFactory{RemoteLinux::Constants::MakeInstallStepId};
 
     const QList<Core::Id> supportedRunConfigs {
         m_runConfigFactory.id(),
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp
index a355e941759..cd3ab65546f 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp
@@ -26,6 +26,7 @@
 #include "genericdirectuploadstep.h"
 
 #include "genericdirectuploadservice.h"
+#include "remotelinux_constants.h"
 
 #include <projectexplorer/deploymentdata.h>
 #include <projectexplorer/target.h>
@@ -79,7 +80,7 @@ GenericDirectUploadStep::~GenericDirectUploadStep() = default;
 
 Core::Id GenericDirectUploadStep::stepId()
 {
-    return "RemoteLinux.DirectUploadStep";
+    return Constants::DirectUploadStepId;
 }
 
 QString GenericDirectUploadStep::displayName()
diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp
index 8aa811a9443..b4ce1b5632d 100644
--- a/src/plugins/remotelinux/makeinstallstep.cpp
+++ b/src/plugins/remotelinux/makeinstallstep.cpp
@@ -25,6 +25,8 @@
 
 #include "makeinstallstep.h"
 
+#include "remotelinux_constants.h"
+
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/buildsystem.h>
@@ -112,7 +114,7 @@ MakeInstallStep::MakeInstallStep(BuildStepList *parent, Core::Id id) : MakeStep(
 
 Core::Id MakeInstallStep::stepId()
 {
-    return "RemoteLinux.MakeInstall";
+    return Constants::MakeInstallStepId;
 }
 
 QString MakeInstallStep::displayName()
diff --git a/src/plugins/remotelinux/remotelinux_constants.h b/src/plugins/remotelinux/remotelinux_constants.h
index 479dfda1679..951603ccfab 100644
--- a/src/plugins/remotelinux/remotelinux_constants.h
+++ b/src/plugins/remotelinux/remotelinux_constants.h
@@ -30,5 +30,9 @@ namespace Constants {
 
 const char GenericLinuxOsType[] = "GenericLinuxOsType";
 
+const char CheckForFreeDiskSpaceId[] = "RemoteLinux.CheckForFreeDiskSpaceStep";
+const char DirectUploadStepId[] = "RemoteLinux.DirectUploadStep";
+const char MakeInstallStepId[] = "RemoteLinux.MakeInstall";
+
 } // Constants
 } // RemoteLinux