diff --git a/.gitignore b/.gitignore
index f065a10a61..b45ff6524e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,7 +73,6 @@ logs.txt
 
 */Cert.crt
 */Key.key
-Nginx/default.conf
 
 Certs/StatusPageCerts/*.crt
 Certs/StatusPageCerts/*.key
diff --git a/Nginx/default.tpl.conf b/Nginx/default.conf
similarity index 99%
rename from Nginx/default.tpl.conf
rename to Nginx/default.conf
index 3a852e1603..5bd53ac6f8 100644
--- a/Nginx/default.tpl.conf
+++ b/Nginx/default.conf
@@ -159,10 +159,7 @@ server {
     listen 443 ssl; # Port HTTPS
     listen 80;
 
-    server_name localhost; 
-    {{ if ne .Env.DOMAIN "localhost" }}
-    server_name {{ .Env.DOMAIN }}; 
-    {{ end }} 
+    server_name localhost $DOMAIN; #All domains
 
     ssl_certificate /etc/nginx/certs/ServerCerts/Cert.crt; 
     ssl_certificate_key /etc/nginx/certs/ServerCerts/Key.key;