diff --git a/roles/wallabag/templates/docker-stack.yml.j2 b/roles/wallabag/templates/docker-stack.yml.j2
index df3a73f..ee7e307 100644
--- a/roles/wallabag/templates/docker-stack.yml.j2
+++ b/roles/wallabag/templates/docker-stack.yml.j2
@@ -16,7 +16,7 @@ services:
     environment:
       - SYMFONY__ENV__FOSUSER_REGISTRATION=false
 {% if server_domain is not undefined and not none %}   
-      - SYMFONY__ENV__DOMAIN_NAME={{ (wallabag_use_https == True) | ternary('https', 'http') }}://wallabag.{{ server_domain }}
+      - "SYMFONY__ENV__DOMAIN_NAME={{ (wallabag_use_https == True) | ternary('https', 'http') }}://{{ (subdomain_alias is not undefined and not none) | ternary(subdomain_alias, stack_name) }}.{{server_domain}}"
 {% else %}
       - SYMFONY__ENV__DOMAIN_NAME={{ (wallabag_use_https == True) | ternary('https', 'http') }}://localhost
 {% endif %}