diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/ConsoleJvmApplicationTemplatePlugin.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/ConsoleJvmApplicationTemplatePlugin.kt
index b507ab3822a..f2fe4b5660b 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/ConsoleJvmApplicationTemplatePlugin.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/ConsoleJvmApplicationTemplatePlugin.kt
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.tools.projectWizard.plugins.templates
 import org.jetbrains.kotlin.tools.projectWizard.core.Context
 import org.jetbrains.kotlin.tools.projectWizard.core.PluginSettingsOwner
 import org.jetbrains.kotlin.tools.projectWizard.core.entity.PipelineTask
+import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase
 import org.jetbrains.kotlin.tools.projectWizard.templates.ConsoleJvmApplicationTemplate
 
 class ConsoleJvmApplicationTemplatePlugin(context: Context) : TemplatePlugin(context) {
@@ -13,6 +14,10 @@ class ConsoleJvmApplicationTemplatePlugin(context: Context) : TemplatePlugin(con
     companion object : PluginSettingsOwner() {
         override val pluginPath = "template.consoleJvmApplicationTemplate"
 
-        val addTemplate by addTemplateTask(ConsoleJvmApplicationTemplate())
+        val addTemplate by pipelineTask(GenerationPhase.PREPARE) {
+            withAction {
+                TemplatesPlugin.addTemplate.execute(ConsoleJvmApplicationTemplate())
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/JsTemplatesPlugin.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/JsTemplatesPlugin.kt
index 78ce4bed464..6c59bda7a22 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/JsTemplatesPlugin.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/JsTemplatesPlugin.kt
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.tools.projectWizard.plugins.templates
 import org.jetbrains.kotlin.tools.projectWizard.core.Context
 import org.jetbrains.kotlin.tools.projectWizard.core.PluginSettingsOwner
 import org.jetbrains.kotlin.tools.projectWizard.core.entity.PipelineTask
+import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase
 import org.jetbrains.kotlin.tools.projectWizard.templates.SimpleJsClientTemplate
 
 class JsTemplatesPlugin(context: Context) : TemplatePlugin(context) {
@@ -16,6 +17,10 @@ class JsTemplatesPlugin(context: Context) : TemplatePlugin(context) {
     companion object : PluginSettingsOwner() {
         override val pluginPath = "template.jsTemplates"
 
-        val addTemplate by addTemplateTask(SimpleJsClientTemplate())
+        val addTemplate by pipelineTask(GenerationPhase.PREPARE) {
+            withAction {
+                TemplatesPlugin.addTemplate.execute(SimpleJsClientTemplate())
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/KtorTemplatesPlugin.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/KtorTemplatesPlugin.kt
index f457fb3852d..6af3346f087 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/KtorTemplatesPlugin.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/KtorTemplatesPlugin.kt
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.tools.projectWizard.plugins.templates
 import org.jetbrains.kotlin.tools.projectWizard.core.Context
 import org.jetbrains.kotlin.tools.projectWizard.core.PluginSettingsOwner
 import org.jetbrains.kotlin.tools.projectWizard.core.entity.PipelineTask
+import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase
 import org.jetbrains.kotlin.tools.projectWizard.templates.KtorServerTemplate
 
 class KtorTemplatesPlugin(context: Context) : TemplatePlugin(context) {
@@ -16,6 +17,10 @@ class KtorTemplatesPlugin(context: Context) : TemplatePlugin(context) {
     companion object: PluginSettingsOwner() {
         override val pluginPath = "template.ktorTemplates"
 
-        val addTemplate by addTemplateTask(KtorServerTemplate())
+        val addTemplate by pipelineTask(GenerationPhase.PREPARE) {
+            withAction {
+                TemplatesPlugin.addTemplate.execute(KtorServerTemplate())
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/NativeConsoleApplicationTemplatePlugin.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/NativeConsoleApplicationTemplatePlugin.kt
index 1532102e62c..e4f7208e6d8 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/NativeConsoleApplicationTemplatePlugin.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/NativeConsoleApplicationTemplatePlugin.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.tools.projectWizard.plugins.templates
 import org.jetbrains.kotlin.tools.projectWizard.core.Context
 import org.jetbrains.kotlin.tools.projectWizard.core.PluginSettingsOwner
 import org.jetbrains.kotlin.tools.projectWizard.core.entity.PipelineTask
+import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase
 import org.jetbrains.kotlin.tools.projectWizard.templates.NativeConsoleApplicationTemplate
 
 class NativeConsoleApplicationTemplatePlugin(context: Context) : TemplatePlugin(context) {
@@ -21,6 +22,10 @@ class NativeConsoleApplicationTemplatePlugin(context: Context) : TemplatePlugin(
     companion object : PluginSettingsOwner() {
         override val pluginPath = "template.nativeConsoleApplicationTemplate"
 
-        val addTemplate by addTemplateTask( NativeConsoleApplicationTemplate())
+        val addTemplate by pipelineTask(GenerationPhase.PREPARE) {
+            withAction {
+                TemplatesPlugin.addTemplate.execute(NativeConsoleApplicationTemplate())
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/SimpleNodeJsTemplatesPlugin.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/SimpleNodeJsTemplatesPlugin.kt
index c9f4526e16a..d772d23208a 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/SimpleNodeJsTemplatesPlugin.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/SimpleNodeJsTemplatesPlugin.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.tools.projectWizard.plugins.templates
 import org.jetbrains.kotlin.tools.projectWizard.core.Context
 import org.jetbrains.kotlin.tools.projectWizard.core.PluginSettingsOwner
 import org.jetbrains.kotlin.tools.projectWizard.core.entity.PipelineTask
+import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase
 import org.jetbrains.kotlin.tools.projectWizard.templates.KtorServerTemplate
 import org.jetbrains.kotlin.tools.projectWizard.templates.SimpleNodeJsTemplate
 
@@ -19,11 +20,13 @@ class SimpleNodeJsTemplatesPlugin(context: Context) : TemplatePlugin(context) {
                 KtorTemplatesPlugin.addTemplate,
             )
 
-    val addTemplate by addTemplateTask(SimpleNodeJsTemplate())
-
     companion object : PluginSettingsOwner() {
         override val pluginPath = "template.simpleNodeJs"
 
-        val addTemplate by addTemplateTask(KtorServerTemplate())
+        val addTemplate by pipelineTask(GenerationPhase.PREPARE) {
+            withAction {
+                TemplatesPlugin.addTemplate.execute(SimpleNodeJsTemplate())
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/TemplatePlugin.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/TemplatePlugin.kt
index 1318cb3ab45..4c6741417f9 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/TemplatePlugin.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/TemplatePlugin.kt
@@ -18,11 +18,5 @@ abstract class TemplatePlugin(context: Context) : Plugin(context) {
 
     companion object : PluginSettingsOwner() {
         override val pluginPath = "template"
-
-        fun addTemplateTask(template: Template) = pipelineTask(GenerationPhase.PREPARE) {
-            withAction {
-                TemplatesPlugin.addTemplate.execute(template)
-            }
-        }
     }
 }