diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1b312cf65..579e10262 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,6 +1,18 @@
 name: Pure.DI check
 
-on: [ push ]
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["master"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
 
 jobs:
   build:
@@ -21,9 +33,28 @@ jobs:
       - name: Publish Blazor example
         run: dotnet run --project ./build -- publish
 
-      - name: Commit wwwroot to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@3.7.1
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+        
+      - name: Build with Jekyll
+        uses: actions/jekyll-build-pages@v1
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages
-          FOLDER: root
+          source: ./root/wwwroot
+          destination: ./_site          
+          
+      - name: Upload artifact        
+        uses: actions/upload-pages-artifact@v3
+  
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+      
+    runs-on: ubuntu-latest
+    needs: build
+    
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/.gitignore b/.gitignore
index ec2c6cdd8..9854261a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,4 @@ benchmarks/data/results/*.md
 _ReSharper.Caches/
 .idea
 .logs
-
+root
diff --git a/build/PublishBlazorTarget.cs b/build/PublishBlazorTarget.cs
index f5a9e2082..a34e3c471 100644
--- a/build/PublishBlazorTarget.cs
+++ b/build/PublishBlazorTarget.cs
@@ -20,26 +20,28 @@ public Task InitializeAsync() => commands.Register(
     [SuppressMessage("Performance", "CA1861:Avoid constant arrays as arguments")]
     public async Task<int> RunAsync(CancellationToken cancellationToken)
     {
+        var wwwroot = Path.Combine("root", "wwwroot");
+        if (Directory.Exists(wwwroot))
+        {
+            Directory.Delete(wwwroot, true);
+        }
+        
         var result = await new DotNetPublish()
             .WithProject(Path.Combine("samples", "BlazorWebAssemblyApp", "BlazorWebAssemblyApp.csproj"))
             .WithConfiguration("Release")
             .WithOutput("root")
             .RunAsync(cancellationToken: cancellationToken);
-
-        var wwwroot = Path.Combine("root", "wwwroot");
         
         // Change the base-tag in index.html from '/' to 'BlazorWebAssemblyApp' to match GitHub Pages repository subdirectory
         var indexFile = Path.Combine(wwwroot, "index.html");
         var indexContent = await File.ReadAllTextAsync(indexFile, cancellationToken);
-        indexContent = indexContent.Replace("""<base href="/" />""", """<base href="/BlazorWebAssemblyApp" />""");
+        indexContent = indexContent
+            .Replace("""<base href="/" />""", """<base href="/Pure.DI/" />""")
+            .Replace("_framework", "framework");
         await File.WriteAllTextAsync(indexFile, indexContent, cancellationToken);
         
-        // Copy index.html to 404.html to serve the same file when a file is not found
-        File.Copy(indexFile, Path.Combine(wwwroot, "404.html"));
+        Directory.Move(Path.Combine(wwwroot, "_framework"), Path.Combine(wwwroot, "framework"));
         
-        // Add .nojekyll file to tell GitHub pages to not treat this as a Jekyll project. (Allow files and folders starting with an underscore)
-        await File.AppendAllTextAsync(Path.Combine(wwwroot, ".nojekyll"), "", cancellationToken);
-
         return result ?? 1;
     }
 }
\ No newline at end of file
diff --git a/samples/BlazorWebAssemblyApp/wwwroot/index.html b/samples/BlazorWebAssemblyApp/wwwroot/index.html
index d9f7633dc..ddd4ff90e 100644
--- a/samples/BlazorWebAssemblyApp/wwwroot/index.html
+++ b/samples/BlazorWebAssemblyApp/wwwroot/index.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-    <title>BlazorWebAssemblyApp</title>
+    <title>Pure.DI Blazor WebAssembly App</title>
     <base href="/" />
     <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
     <link href="css/app.css" rel="stylesheet" />