diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.cs
index b5edcd5d54..a5085f83a9 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.cs
@@ -39,9 +39,9 @@ public static class FileEntryExtensions
             {
                 //TODO: What if we use inline like: <TEMPLATE-REMOVE IF-NOT="..."> some-code </TEMPLATE-REMOVE>
                 //TODO: This logic skips the code in that case. Should handle it
-                ++i;
+                continue;
             }
-
+            
             if (i < lines.Length)
             {
                 newLines.Add(lines[i]);
@@ -146,6 +146,7 @@ public static class FileEntryExtensions
         var condition = marker.Trim()
             .RemovePreFix("//").Trim()
             .RemovePreFix("@*").Trim()
+            .RemovePreFix("#").Trim()
             .RemovePreFix("<!--").Trim()
             .RemovePreFix("<TEMPLATE-REMOVE").Trim()
             .RemovePostFix("*@").Trim()
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 6a0b532135..c94783fa0f 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
@@ -37,6 +37,7 @@ public abstract class AppTemplateBase : TemplateInfo
         RandomizeSslPorts(context, steps);
         RandomizeStringEncryption(context, steps);
         UpdateNuGetConfig(context, steps);
+        ConfigureDockerFiles(context, steps);
         ChangeConnectionString(context, steps);
         CleanupFolderHierarchy(context, steps);