diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/wwwroot/_framework/.gitkeep b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/wwwroot/_framework/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs
index c7742356d9..35d03a3eb3 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs
@@ -55,16 +55,23 @@ public void ConfigureMiddlewares()
                 app.UseDirectoryBrowser();
             }
 
-            app.UseStaticFiles(options: new()
+            app.Use(async (context, next) =>
             {
-                OnPrepareResponse = staticFileResponseContext =>
+                context.Response.OnStarting(async () =>
                 {
-                    if (env.IsDevelopment() is false)
+                    if (env.IsDevelopment())
+                    {
+                        context.Response.GetTypedHeaders().CacheControl = new()
+                        {
+                            NoCache = true
+                        };
+                    }
+                    else
                     {
                         // Caching static files on the Browser and CDN's edge servers.
-                        if (staticFileResponseContext.Context.Request.Query.Any(q => string.Equals(q.Key, "v", StringComparison.InvariantCultureIgnoreCase)))
+                        if (context.Request.Query.Any(q => string.Equals(q.Key, "v", StringComparison.InvariantCultureIgnoreCase)))
                         {
-                            staticFileResponseContext.Context.Response.GetTypedHeaders().CacheControl = new()
+                            context.Response.GetTypedHeaders().CacheControl = new()
                             {
                                 Public = true,
                                 NoTransform = true,
@@ -72,9 +79,13 @@ public void ConfigureMiddlewares()
                             };
                         }
                     }
-                }
+                });
+
+                await next.Invoke();
             });
 
+            app.UseStaticFiles();
+
             // https://yurl.chayev.com/
             app.UseWhen(context => context.Request.Path.StartsWithSegments("/.well-known"), wellKnownApp =>
             {