diff --git a/.github/ISSUE_TEMPLATE/10_bug_report.yml b/.github/ISSUE_TEMPLATE/10_bug_report.yml
index 1c488776e30..a68a40d3e86 100644
--- a/.github/ISSUE_TEMPLATE/10_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/10_bug_report.yml
@@ -66,11 +66,15 @@ body:
     description: Include the exception you get when facing this issue.
   validations:
     required: false
-- type: input
+- type: dropdown
   attributes:
     label: .NET Version
-    description: |
-      Run `dotnet --version`
+    options:
+      - NET9.0
+      - NET8.0
+      - NET7.0
+      - NET6.0
+    default: 1
   validations:
     required: true
 - type: textarea
diff --git a/BootstrapBlazor.sln b/BootstrapBlazor.sln
index aea7e53597a..16eedd6160f 100644
--- a/BootstrapBlazor.sln
+++ b/BootstrapBlazor.sln
@@ -15,7 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "linux", "linux", "{EA765165
 	ProjectSection(SolutionItems) = preProject
 		scripts\linux\ba.blazor.service = scripts\linux\ba.blazor.service
 		scripts\linux\deploy-blazor.sh = scripts\linux\deploy-blazor.sh
-		scripts\linux\deploy-wasm.sh = scripts\linux\deploy-wasm.sh
 		scripts\linux\nginx.conf = scripts\linux\nginx.conf
 	EndProjectSection
 EndProject
diff --git a/scripts/linux/deploy-blazor.sh b/scripts/linux/deploy-blazor.sh
index 30a2ca60aa5..cef4fd54104 100644
--- a/scripts/linux/deploy-blazor.sh
+++ b/scripts/linux/deploy-blazor.sh
@@ -1,14 +1,15 @@
 #! /bin/bash
 
 cd ~/BootstrapBlazor
-curl https://www.blazor.zone/api/dispatch?token=BootstrapBlazor-Publish
-
 git pull
+
+curl https://www.blazor.zone/api/dispatch?token=BootstrapBlazor-Publish
 dotnet build src/BootstrapBlazor.Server
-dotnet publish src/BootstrapBlazor.Server -c Release
+
 curl https://www.blazor.zone/api/dispatch?token=BootstrapBlazor-Reboot
+dotnet publish src/BootstrapBlazor.Server -c Release
 
 systemctl stop ba.blazor
-\cp -fr ~/BootstrapBlazor/src/BootstrapBlazor.Server/bin/Release/net8.0/publish/* /usr/local/ba/blazor
+\cp -fr ~/BootstrapBlazor/src/BootstrapBlazor.Server/bin/Release/net9.0/publish/* /usr/local/ba/blazor
 systemctl start ba.blazor
 systemctl status ba.blazor -l --no-pager
diff --git a/scripts/linux/deploy-wasm.sh b/scripts/linux/deploy-wasm.sh
deleted file mode 100644
index f2c5b2cd953..00000000000
--- a/scripts/linux/deploy-wasm.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/bash
-
-cd ~/BootstrapBlazor
-git pull
-
-dotnet publish ~/BootstrapBlazor/src/Wasm/BootstrapBlazor.WebAssembly.ClientHost -c Release -o /usr/local/ba/wasm/
diff --git a/scripts/linux/nginx.conf b/scripts/linux/nginx.conf
index f85b97078ac..3ba8261e481 100644
--- a/scripts/linux/nginx.conf
+++ b/scripts/linux/nginx.conf
@@ -1,11 +1,7 @@
 #user  nobody;
 worker_processes  1;
 
-#error_log  logs/error.log;
-#error_log  logs/error.log  notice;
-#error_log  logs/error.log  info;
-
-#pid        logs/nginx.pid;
+error_log  logs/error.log;
 
 events {
     worker_connections  1024;
@@ -19,38 +15,48 @@ http {
 
     server {
         listen       80;
-        server_name  www.blazor.zone;
+        server_name  blazor.zone;
 	    client_max_body_size 20m;
-        rewrite ^(.*)$  https://$host$1 redirect;
-        error_page 404 500 /50x.html;
+        rewrite ^(.*)$  https://www.blazor.zone$1 redirect;
         proxy_redirect  off;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        location / {
-            proxy_connect_timeout  1;
-            proxy_pass http://localhost:50853;
-        }
-
-        location /_blazor  {
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
-            proxy_pass http://localhost:50853/_blazor;
-	    }
+    }
 
-        location = /50x.html {
-            root   html;
-        }
+    server {
+        listen      443 ssl;
+        server_name blazor.zone;
+        rewrite ^(.*)$  https://www.blazor.zone$1 redirect;
+        ssl_certificate ./cert/blazor.zone.cer;
+        ssl_certificate_key ./cert/blazor.zone.key;
+        ssl_session_cache shared:SSL:1m;
+        ssl_session_timeout 5m;
+        ssl_ciphers     HIGH:!aNULL:!MD5;
+        ssl_prefer_server_ciphers   on;
+        proxy_set_header    Host                $host;
+        proxy_set_header    X-Real-IP           $remote_addr;
+        proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
+        proxy_set_header    X-Forwarded-Proto   $scheme;
+        add_header          X-Frame-Options     SAMEORIGIN;
+    }
 
-        error_page  404 500 502 503 504  /50x.html;
+    server {
+        listen       80;
+        server_name  www.blazor.zone;
+	    client_max_body_size 20m;
+        rewrite ^(.*)$  https://$host$1 redirect;
+        proxy_redirect  off;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }
 
     server {
         listen      443 ssl;
         server_name www.blazor.zone;
-        ssl_certificate blazor_zone.crt;
-        ssl_certificate_key blazor_zone.key;
+        ssl_certificate ./cert/www.blazor.zone.cer;
+        ssl_certificate_key ./cert/www.blazor.zone.key;
         ssl_session_cache shared:SSL:1m;
         ssl_session_timeout 5m;
         ssl_ciphers     HIGH:!aNULL:!MD5;
@@ -60,6 +66,8 @@ http {
         proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
         proxy_set_header    X-Forwarded-Proto   $scheme;
         add_header          X-Frame-Options     SAMEORIGIN;
+        proxy_intercept_errors on;
+        error_page 404 500 502 /502.html;
 
         location / {
             proxy_connect_timeout  1;
@@ -72,5 +80,10 @@ http {
             proxy_set_header Connection "upgrade";
             proxy_pass http://localhost:50853/_blazor;
         }
+
+        location = /502.html {
+            root html;
+            internal;
+        }
     }
 }