diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs
index 098048c5b4..ab146d6abe 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs
@@ -22,7 +22,7 @@ public abstract class AppNoLayersTemplateBase : TemplateInfo
     public override IEnumerable<ProjectBuildPipelineStep> GetCustomSteps(ProjectBuildContext context)
     {
         var steps = base.GetCustomSteps(context).ToList();
-        
+
         SwitchDatabaseProvider(context, steps);
         DeleteUnrelatedProjects(context, steps);
         RemoveMigrations(context, steps);
@@ -130,7 +130,7 @@ public abstract class AppNoLayersTemplateBase : TemplateInfo
                 throw new AbpException("Unkown UI framework: " + context.BuildArgs.UiFramework);
         }
     }
-    
+
     protected void RandomizeSslPorts(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
     {
         if (context.BuildArgs.ExtraProperties.ContainsKey("no-random-port"))
@@ -157,7 +157,7 @@ public abstract class AppNoLayersTemplateBase : TemplateInfo
             )
         );
     }
-    
+
     protected void CleanupFolderHierarchy(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
     {
         if (context.BuildArgs.UiFramework != UiFramework.Angular)
@@ -165,7 +165,7 @@ public abstract class AppNoLayersTemplateBase : TemplateInfo
             steps.Add(new MoveFolderStep("/aspnet-core/", "/"));
         }
     }
-    
+
     protected void RemoveMigrations(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
     {
         steps.Add(new RemoveFolderStep("/aspnet-core/MyCompanyName.MyProjectName/Migrations"));
@@ -202,12 +202,12 @@ public abstract class AppNoLayersTemplateBase : TemplateInfo
                 break;
         }
     }
-    
+
     protected void RandomizeStringEncryption(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
     {
         steps.Add(new RandomizeStringEncryptionStep());
     }
-    
+
     protected static void RandomizeAuthServerPassPhrase(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
     {
         steps.Add(new RandomizeAuthServerPassPhraseStep());
@@ -217,7 +217,7 @@ public abstract class AppNoLayersTemplateBase : TemplateInfo
     {
         steps.Add(new UpdateNuGetConfigStep("/aspnet-core/NuGet.Config"));
     }
-    
+
     protected void ChangeConnectionString(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
     {
         if (context.BuildArgs.ConnectionString != null)
@@ -230,7 +230,7 @@ public abstract class AppNoLayersTemplateBase : TemplateInfo
             steps.Add(new ConnectionStringRenameStep());
         }
     }
-    
+
     protected void ConfigureTheme(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
     {
         if (!context.BuildArgs.Theme.HasValue)
@@ -256,9 +256,9 @@ public abstract class AppNoLayersTemplateBase : TemplateInfo
         }
 
         steps.Add(new ChangeThemeStep());
-        ReplaceLeptonXThemePackagesFromPackageJsonFiles(steps, isProTemplate: IsPro(), uiFramework: context.BuildArgs.UiFramework, theme: context.BuildArgs.Theme, version: context.BuildArgs.Version);
+        ReplaceLeptonXThemePackagesFromPackageJsonFiles(steps, isProTemplate: IsPro(), uiFramework: context.BuildArgs.UiFramework, theme: context.BuildArgs.Theme, version: context.BuildArgs.Version ?? context.TemplateFile.Version);
     }
-    
+
     private static void RemoveBlazorWasmProjects(List<ProjectBuildPipelineStep> steps)
     {
         steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.WebAssembly.Server",
@@ -269,7 +269,7 @@ public abstract class AppNoLayersTemplateBase : TemplateInfo
             projectFolderPath: "/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Shared"));
         steps.Add(new RemoveFolderStep("/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly"));
     }
-    
+
     private void RemoveThemeLogoFolders(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
     {
         if (context.BuildArgs.Theme != Theme.Lepton && IsPro())
@@ -282,7 +282,7 @@ public abstract class AppNoLayersTemplateBase : TemplateInfo
             steps.Add(new RemoveFilesStep("/wwwroot/images/logo/leptonx/"));
         }
     }
-    
+
     protected void SetDbmsSymbols(ProjectBuildContext context)
     {
         switch (context.BuildArgs.DatabaseManagementSystem)
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 8d4717c8b0..95c1b27353 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
@@ -232,7 +232,7 @@ public abstract class AppTemplateBase : TemplateInfo
         }
 
         steps.Add(new ChangeThemeStep());
-        ReplaceLeptonXThemePackagesFromPackageJsonFiles(steps, isProTemplate: IsPro(), uiFramework: context.BuildArgs.UiFramework, theme: context.BuildArgs.Theme, version: context.BuildArgs.Version);
+        ReplaceLeptonXThemePackagesFromPackageJsonFiles(steps, isProTemplate: IsPro(), uiFramework: context.BuildArgs.UiFramework, theme: context.BuildArgs.Theme, version: context.BuildArgs.Version ?? context.TemplateFile.Version);
     }
 
     protected void SetDbmsSymbols(ProjectBuildContext context)
@@ -264,7 +264,7 @@ public abstract class AppTemplateBase : TemplateInfo
                 throw new AbpException("Unknown Dbms: " + context.BuildArgs.DatabaseManagementSystem);
         }
     }
-    
+
     private void RemoveThemeLogoFolders(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
     {
         if (context.BuildArgs.Theme != Theme.Lepton && IsPro())
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs
index 6f2cb165ec..a1936f9c6b 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs
@@ -51,7 +51,7 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
         }
 
         steps.Add(new ChangeThemeStep());
-        ReplaceLeptonXThemePackagesFromPackageJsonFiles(steps, uiFramework: context.BuildArgs.UiFramework, theme: context.BuildArgs.Theme, version: context.BuildArgs.Version);
+        ReplaceLeptonXThemePackagesFromPackageJsonFiles(steps, uiFramework: context.BuildArgs.UiFramework, theme: context.BuildArgs.Theme, version: context.BuildArgs.Version ?? context.TemplateFile.Version);
     }
 
     private static void ReplaceLeptonXThemePackagesFromPackageJsonFiles(List<ProjectBuildPipelineStep> steps, UiFramework uiFramework, Theme? theme, string version)