diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplate.cs
index a676526577..8dbedb61f4 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplate.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplate.cs
@@ -65,7 +65,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                     steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Host"));
                     steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.Host"));
                     steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
-                    steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep());
+                    steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44303"));
                 }
 
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds"));
@@ -87,6 +87,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                     steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.Host"));
                     steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
                     steps.Add(new AppTemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
+                    steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305"));
                 }
             }
 
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateChangeConsoleTestClientPortSettingsStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateChangeConsoleTestClientPortSettingsStep.cs
index 835087a837..dbd5022f5b 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateChangeConsoleTestClientPortSettingsStep.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateChangeConsoleTestClientPortSettingsStep.cs
@@ -5,12 +5,25 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
 {
     public class AppTemplateChangeConsoleTestClientPortSettingsStep : ProjectBuildPipelineStep
     {
+        public string RemoteServicePort { get; }
+        public string IdentityServerPort { get; }
+
+        /// <param name="remoteServicePort"></param>
+        /// <param name="identityServerPort">Assumed same as the <paramref name="remoteServicePort"/> if leaved as null.</param>
+        public AppTemplateChangeConsoleTestClientPortSettingsStep(
+            string remoteServicePort, 
+            string identityServerPort = null)
+        {
+            RemoteServicePort = remoteServicePort;
+            IdentityServerPort = identityServerPort ?? remoteServicePort;
+        }
+
         public override void Execute(ProjectBuildContext context)
         {
             context
                 .GetFile("/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json")
-                .ReplaceText("44395", "44361")
-                .ReplaceText("44348", "44361");
+                .ReplaceText("44300", RemoteServicePort)
+                .ReplaceText("44301", IdentityServerPort);
         }
     }
 }