diff --git a/roles/nginx/templates/nginx/sites-available/service.j2 b/roles/nginx/templates/nginx/sites-available/service.j2
index bf529e50..5a883a48 100644
--- a/roles/nginx/templates/nginx/sites-available/service.j2
+++ b/roles/nginx/templates/nginx/sites-available/service.j2
@@ -21,7 +21,7 @@ server {
     listen [::]:443 default_server ssl;
     include "/etc/nginx/snippets/options-ssl.conf";
 
-    server_name {{ nginx.default_ssl_server }};
+    server_name _;
     charset utf-8;
 
     # Hide Nginx version
@@ -39,7 +39,7 @@ server {
     listen 80 default_server;
     listen [::]:80 default_server;
 
-    server_name {{ nginx.default_server }};
+    server_name _;
     charset utf-8;
 
     # Hide Nginx version
@@ -55,8 +55,8 @@ server {
 {% if server.ssl is defined and server.ssl -%}
 # Redirect HTTP to HTTPS
 server {
-    listen 80 default;
-    listen [::]:80 default;
+    listen 80;
+    listen [::]:80;
 
     server_name {{ server.server_name|join(" ") }};
     charset utf-8;
@@ -72,8 +72,8 @@ server {
 
 server {
     {% if server.ssl is defined and server.ssl -%}
-    listen 443 default_server ssl;
-    listen [::]:443 default_server ssl;
+    listen 443 ssl;
+    listen [::]:443 ssl;
     include "/etc/nginx/snippets/options-ssl.conf";
     {% else -%}
     listen 80 default;