diff --git a/freqtrade/commands/deploy_commands.py b/freqtrade/commands/deploy_commands.py
index 92c9adf66..9ec33eac4 100644
--- a/freqtrade/commands/deploy_commands.py
+++ b/freqtrade/commands/deploy_commands.py
@@ -36,24 +36,24 @@ def deploy_new_strategy(strategy_name: str, strategy_path: Path, subtemplate: st
     """
     fallback = 'full'
     indicators = render_template_with_fallback(
-        templatefile=f"subtemplates/indicators_{subtemplate}.j2",
-        templatefallbackfile=f"subtemplates/indicators_{fallback}.j2",
+        templatefile=f"strategy_subtemplates/indicators_{subtemplate}.j2",
+        templatefallbackfile=f"strategy_subtemplates/indicators_{fallback}.j2",
     )
     buy_trend = render_template_with_fallback(
-        templatefile=f"subtemplates/buy_trend_{subtemplate}.j2",
-        templatefallbackfile=f"subtemplates/buy_trend_{fallback}.j2",
+        templatefile=f"strategy_subtemplates/buy_trend_{subtemplate}.j2",
+        templatefallbackfile=f"strategy_subtemplates/buy_trend_{fallback}.j2",
     )
     sell_trend = render_template_with_fallback(
-        templatefile=f"subtemplates/sell_trend_{subtemplate}.j2",
-        templatefallbackfile=f"subtemplates/sell_trend_{fallback}.j2",
+        templatefile=f"strategy_subtemplates/sell_trend_{subtemplate}.j2",
+        templatefallbackfile=f"strategy_subtemplates/sell_trend_{fallback}.j2",
     )
     plot_config = render_template_with_fallback(
-        templatefile=f"subtemplates/plot_config_{subtemplate}.j2",
-        templatefallbackfile=f"subtemplates/plot_config_{fallback}.j2",
+        templatefile=f"strategy_subtemplates/plot_config_{subtemplate}.j2",
+        templatefallbackfile=f"strategy_subtemplates/plot_config_{fallback}.j2",
     )
     additional_methods = render_template_with_fallback(
-        templatefile=f"subtemplates/strategy_methods_{subtemplate}.j2",
-        templatefallbackfile="subtemplates/strategy_methods_empty.j2",
+        templatefile=f"strategy_subtemplates/strategy_methods_{subtemplate}.j2",
+        templatefallbackfile="strategy_subtemplates/strategy_methods_empty.j2",
     )
 
     strategy_text = render_template(templatefile='base_strategy.py.j2',
diff --git a/freqtrade/templates/subtemplates/buy_trend_full.j2 b/freqtrade/templates/strategy_subtemplates/buy_trend_full.j2
similarity index 100%
rename from freqtrade/templates/subtemplates/buy_trend_full.j2
rename to freqtrade/templates/strategy_subtemplates/buy_trend_full.j2
diff --git a/freqtrade/templates/subtemplates/buy_trend_minimal.j2 b/freqtrade/templates/strategy_subtemplates/buy_trend_minimal.j2
similarity index 100%
rename from freqtrade/templates/subtemplates/buy_trend_minimal.j2
rename to freqtrade/templates/strategy_subtemplates/buy_trend_minimal.j2
diff --git a/freqtrade/templates/subtemplates/indicators_full.j2 b/freqtrade/templates/strategy_subtemplates/indicators_full.j2
similarity index 100%
rename from freqtrade/templates/subtemplates/indicators_full.j2
rename to freqtrade/templates/strategy_subtemplates/indicators_full.j2
diff --git a/freqtrade/templates/subtemplates/indicators_minimal.j2 b/freqtrade/templates/strategy_subtemplates/indicators_minimal.j2
similarity index 100%
rename from freqtrade/templates/subtemplates/indicators_minimal.j2
rename to freqtrade/templates/strategy_subtemplates/indicators_minimal.j2
diff --git a/freqtrade/templates/subtemplates/plot_config_full.j2 b/freqtrade/templates/strategy_subtemplates/plot_config_full.j2
similarity index 100%
rename from freqtrade/templates/subtemplates/plot_config_full.j2
rename to freqtrade/templates/strategy_subtemplates/plot_config_full.j2
diff --git a/freqtrade/templates/subtemplates/plot_config_minimal.j2 b/freqtrade/templates/strategy_subtemplates/plot_config_minimal.j2
similarity index 100%
rename from freqtrade/templates/subtemplates/plot_config_minimal.j2
rename to freqtrade/templates/strategy_subtemplates/plot_config_minimal.j2
diff --git a/freqtrade/templates/subtemplates/sell_trend_full.j2 b/freqtrade/templates/strategy_subtemplates/sell_trend_full.j2
similarity index 100%
rename from freqtrade/templates/subtemplates/sell_trend_full.j2
rename to freqtrade/templates/strategy_subtemplates/sell_trend_full.j2
diff --git a/freqtrade/templates/subtemplates/sell_trend_minimal.j2 b/freqtrade/templates/strategy_subtemplates/sell_trend_minimal.j2
similarity index 100%
rename from freqtrade/templates/subtemplates/sell_trend_minimal.j2
rename to freqtrade/templates/strategy_subtemplates/sell_trend_minimal.j2
diff --git a/freqtrade/templates/subtemplates/strategy_methods_advanced.j2 b/freqtrade/templates/strategy_subtemplates/strategy_methods_advanced.j2
similarity index 100%
rename from freqtrade/templates/subtemplates/strategy_methods_advanced.j2
rename to freqtrade/templates/strategy_subtemplates/strategy_methods_advanced.j2
diff --git a/freqtrade/templates/subtemplates/strategy_methods_empty.j2 b/freqtrade/templates/strategy_subtemplates/strategy_methods_empty.j2
similarity index 100%
rename from freqtrade/templates/subtemplates/strategy_methods_empty.j2
rename to freqtrade/templates/strategy_subtemplates/strategy_methods_empty.j2
diff --git a/tests/test_misc.py b/tests/test_misc.py
index 107932be4..4b52079bf 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -184,8 +184,8 @@ def test_render_template_fallback(mocker):
             templatefile='subtemplates/indicators_does-not-exist.j2',)
 
     val = render_template_with_fallback(
-        templatefile='subtemplates/indicators_does-not-exist.j2',
-        templatefallbackfile='subtemplates/indicators_minimal.j2',
+        templatefile='strategy_subtemplates/indicators_does-not-exist.j2',
+        templatefallbackfile='strategy_subtemplates/indicators_minimal.j2',
     )
     assert isinstance(val, str)
     assert 'if self.dp' in val