diff --git a/smartgears/smartgears-nginx-frontend/defaults/main.yml b/smartgears/smartgears-nginx-frontend/defaults/main.yml
index 7c0abc0e..95fb2170 100644
--- a/smartgears/smartgears-nginx-frontend/defaults/main.yml
+++ b/smartgears/smartgears-nginx-frontend/defaults/main.yml
@@ -3,4 +3,4 @@ setup_nginx: False
 http_redirect_to_https: False
 letsencrypt_acme_install: False
 smartgears_install_generic_virthost: True
-
+#smartgears_nginx_serveraliases:
diff --git a/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2 b/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2
index a659e5f4..97b89556 100644
--- a/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2
+++ b/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2
@@ -3,7 +3,7 @@ server {
 {% if egi_image is defined and egi_image %}
     # No servername into the EGI images
 {% else %}
-    server_name {{ item.servername }};
+    server_name {{ item.servername }} {% if smartgears_nginx_serveraliases is defined %}{% for vh in smartgears_nginx_serveraliases %} {{ vh }}{% endfor %}{% endif %};
 {% endif %}
 {% if letsencrypt_acme_install %}
     include /etc/nginx/snippets/letsencrypt-proxy.conf;
@@ -87,7 +87,7 @@ server {
 {% if egi_image is defined and egi_image %}
     # No servername into the EGI images
 {% else %}
-    server_name {{ item.servername }};
+    server_name {{ item.servername }} {% if smartgears_nginx_serveraliases is defined %}{% for vh in smartgears_nginx_serveraliases %} {{ vh }}{% endfor %}{% endif %};
 {% endif %}
 
     access_log /var/log/nginx/{{ item.servername }}_access_ssl.log;