diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveEfCoreDependencyFromPublicStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveEfCoreRelatedCodeStep.cs
similarity index 86%
rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveEfCoreDependencyFromPublicStep.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveEfCoreRelatedCodeStep.cs
index 1f7b8f4e6f..df8f18128e 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveEfCoreDependencyFromPublicStep.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveEfCoreRelatedCodeStep.cs
@@ -3,7 +3,7 @@ using Volo.Abp.Cli.ProjectBuilding.Files;
 
 namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
 {
-    public class RemoveEfCoreDependencyFromPublicStep : ProjectBuildPipelineStep
+    public class RemoveEfCoreRelatedCodeStep : ProjectBuildPipelineStep
     {
         public override void Execute(ProjectBuildContext context)
         {
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
index 7541894181..260d996484 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
@@ -64,6 +64,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.EntityFrameworkCore"));
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations"));
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.EntityFrameworkCore.Tests", projectFolderPath: "/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests"));
+                steps.Add(new RemoveEfCoreRelatedCodeStep());
             }
 
             if (context.BuildArgs.DatabaseProvider != DatabaseProvider.MongoDb)
@@ -154,11 +155,6 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                 steps.Add(new ChangePublicAuthPortStep());
             }
 
-            if (context.BuildArgs.DatabaseProvider != DatabaseProvider.NotSpecified && context.BuildArgs.DatabaseProvider != DatabaseProvider.EntityFrameworkCore)
-            {
-                steps.Add(new RemoveEfCoreDependencyFromPublicStep());
-            }
-
             // We disabled cms-kit for v4.2 release.
             if (true || context.BuildArgs.ExtraProperties.ContainsKey("without-cms-kit"))
             {
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs
index 08d784f58d..ef1aed5718 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs
@@ -40,18 +40,14 @@ namespace MyCompanyName.MyProjectName.Data
 
         public async Task MigrateAsync()
         {
-            try
-            {
-                if (DbMigrationsProjectExists() && !MigrationsFolderExists())
-                {
-                    AddInitialMigration();
-                    return;
-                }
-            }
-            catch (Exception e)
+            //<TEMPLATE-REMOVE IF-NOT='EFCORE'>
+            var initialMigrationAdded = AddInitialMigrationIfNotExist();
+
+            if (initialMigrationAdded)
             {
-                Logger.LogWarning("Couldn't determinate if any migrations exist : " + e.Message);
+                return;
             }
+            //</TEMPLATE-REMOVE>
 
             Logger.LogInformation("Started database migrations...");
 
@@ -112,6 +108,40 @@ namespace MyCompanyName.MyProjectName.Data
             );
         }
 
+        //<TEMPLATE-REMOVE IF-NOT='EFCORE'>
+        private bool AddInitialMigrationIfNotExist()
+        {
+            try
+            {
+                if (!DbMigrationsProjectExists())
+                {
+                    return false;
+                }
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+
+            try
+            {
+                if (!MigrationsFolderExists())
+                {
+                    AddInitialMigration();
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            catch (Exception e)
+            {
+                Logger.LogWarning("Couldn't determinate if any migrations exist : " + e.Message);
+                return false;
+            }
+        }
+
         private bool DbMigrationsProjectExists()
         {
             var dbMigrationsProjectFolder = GetDbMigrationsProjectFolderPath();
@@ -123,7 +153,7 @@ namespace MyCompanyName.MyProjectName.Data
         {
             var dbMigrationsProjectFolder = GetDbMigrationsProjectFolderPath();
 
-            return Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "migrations"));
+            return Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "Migrations"));
         }
 
         private void AddInitialMigration()
@@ -144,7 +174,7 @@ namespace MyCompanyName.MyProjectName.Data
                 fileName = "cmd.exe";
             }
 
-            var procStartInfo = new ProcessStartInfo( fileName,
+            var procStartInfo = new ProcessStartInfo(fileName,
                 $"{argumentPrefix} \"abp create-migration-and-run-migrator \"{GetDbMigrationsProjectFolderPath()}\"\""
             );
 
@@ -189,5 +219,6 @@ namespace MyCompanyName.MyProjectName.Data
 
             return null;
         }
+        //</TEMPLATE-REMOVE>
     }
 }