diff --git a/src/plugins/boot2qt/qdbmakedefaultappstep.cpp b/src/plugins/boot2qt/qdbmakedefaultappstep.cpp
index 8b89c3ed22b..3c5f0e3814d 100644
--- a/src/plugins/boot2qt/qdbmakedefaultappstep.cpp
+++ b/src/plugins/boot2qt/qdbmakedefaultappstep.cpp
@@ -92,7 +92,8 @@ public:
     QdbMakeDefaultAppStep(BuildStepList *bsl, Id id)
         : AbstractRemoteLinuxDeployStep(bsl, id)
     {
-        auto service = createDeployService<QdbMakeDefaultAppService>();
+        auto service = new QdbMakeDefaultAppService;
+        setDeployService(service);
 
         auto selection = addAspect<SelectionAspect>();
         selection->setSettingsKey("QdbMakeDefaultDeployStep.MakeDefault");
diff --git a/src/plugins/boot2qt/qdbstopapplicationstep.cpp b/src/plugins/boot2qt/qdbstopapplicationstep.cpp
index 9899598d3e1..e3b3f1b2c7e 100644
--- a/src/plugins/boot2qt/qdbstopapplicationstep.cpp
+++ b/src/plugins/boot2qt/qdbstopapplicationstep.cpp
@@ -115,7 +115,8 @@ public:
     QdbStopApplicationStep(BuildStepList *bsl, Id id)
         : AbstractRemoteLinuxDeployStep(bsl, id)
     {
-        auto service = createDeployService<QdbStopApplicationService>();
+        auto service = new QdbStopApplicationService;
+        setDeployService(service);
 
         setWidgetExpandedByDefault(false);
 
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
index 69c1983994a..4946a0849bb 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
@@ -32,17 +32,9 @@ protected:
 
     void setInternalInitializer(const std::function<CheckResult()> &init);
     void setRunPreparer(const std::function<void()> &prep);
-
-    template <class T>
-    T *createDeployService()
-    {
-        T *service = new T;
-        setDeployService(service);
-        return service;
-    }
+    void setDeployService(AbstractRemoteLinuxDeployService *service);
 
 private:
-    void setDeployService(AbstractRemoteLinuxDeployService *service);
     void handleProgressMessage(const QString &message);
     void handleErrorMessage(const QString &message);
     void handleWarningMessage(const QString &message);
diff --git a/src/plugins/remotelinux/customcommanddeploystep.cpp b/src/plugins/remotelinux/customcommanddeploystep.cpp
index 4bc5a715283..8a7104c42df 100644
--- a/src/plugins/remotelinux/customcommanddeploystep.cpp
+++ b/src/plugins/remotelinux/customcommanddeploystep.cpp
@@ -92,7 +92,8 @@ public:
     CustomCommandDeployStep(BuildStepList *bsl, Id id)
         : AbstractRemoteLinuxDeployStep(bsl, id)
     {
-        auto service = createDeployService<CustomCommandDeployService>();
+        auto service = new CustomCommandDeployService;
+        setDeployService(service);
 
         auto commandLine = addAspect<StringAspect>();
         commandLine->setSettingsKey("RemoteLinuxCustomCommandDeploymentStep.CommandLine");
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp
index 85383f1e213..c01b21c3384 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp
@@ -20,7 +20,8 @@ GenericDirectUploadStep::GenericDirectUploadStep(BuildStepList *bsl, Utils::Id i
                                                  bool offerIncrementalDeployment)
     : AbstractRemoteLinuxDeployStep(bsl, id)
 {
-    auto service = createDeployService<GenericDirectUploadService>();
+    auto service = new GenericDirectUploadService;
+    setDeployService(service);
 
     BoolAspect *incremental = nullptr;
     if (offerIncrementalDeployment) {
diff --git a/src/plugins/remotelinux/killappstep.cpp b/src/plugins/remotelinux/killappstep.cpp
index af19055d509..09670155961 100644
--- a/src/plugins/remotelinux/killappstep.cpp
+++ b/src/plugins/remotelinux/killappstep.cpp
@@ -106,7 +106,8 @@ class KillAppStep : public AbstractRemoteLinuxDeployStep
 public:
     KillAppStep(BuildStepList *bsl, Id id) : AbstractRemoteLinuxDeployStep(bsl, id)
     {
-        auto service = createDeployService<Internal::KillAppService>();
+        auto service = new Internal::KillAppService;
+        setDeployService(service);
 
         setWidgetExpandedByDefault(false);
 
diff --git a/src/plugins/remotelinux/rsyncdeploystep.cpp b/src/plugins/remotelinux/rsyncdeploystep.cpp
index 1f6ae266282..c6cace227ef 100644
--- a/src/plugins/remotelinux/rsyncdeploystep.cpp
+++ b/src/plugins/remotelinux/rsyncdeploystep.cpp
@@ -139,7 +139,8 @@ void RsyncDeployService::setFinished()
 RsyncDeployStep::RsyncDeployStep(BuildStepList *bsl, Id id)
         : AbstractRemoteLinuxDeployStep(bsl, id)
 {
-    auto service = createDeployService<RsyncDeployService>();
+    auto service = new RsyncDeployService;
+    setDeployService(service);
 
     auto flags = addAspect<StringAspect>();
     flags->setDisplayStyle(StringAspect::LineEditDisplay);
diff --git a/src/plugins/remotelinux/tarpackagedeploystep.cpp b/src/plugins/remotelinux/tarpackagedeploystep.cpp
index 0d7d8f729c7..5dd3def96fb 100644
--- a/src/plugins/remotelinux/tarpackagedeploystep.cpp
+++ b/src/plugins/remotelinux/tarpackagedeploystep.cpp
@@ -192,7 +192,8 @@ public:
     TarPackageDeployStep(BuildStepList *bsl, Id id)
         : AbstractRemoteLinuxDeployStep(bsl, id)
     {
-        auto service = createDeployService<TarPackageDeployService>();
+        auto service = new TarPackageDeployService;
+        setDeployService(service);
 
         setWidgetExpandedByDefault(false);