diff --git a/roles/web-app-xwiki/templates/xwiki.properties.j2 b/roles/web-app-xwiki/templates/xwiki.properties.j2
index a8946b07..94fa4d11 100644
--- a/roles/web-app-xwiki/templates/xwiki.properties.j2
+++ b/roles/web-app-xwiki/templates/xwiki.properties.j2
@@ -1,8 +1,14 @@
+# Proxy
+xwiki.url.protocol={{ WEB_PROTOCOL }}
+xwiki.url.host={{ domain }}
+xwiki.url.port={{ WEB_PORT }}
+
 ############################################
 # OIDC
 # Render this block only while the OIDC switch is ON in _flush_config.yml.
 # During bootstrap we keep it OFF to avoid ClassNotFoundException before the extension is installed.
 {% if xwiki_oidc_enabled_switch | bool %}
+oidc.showLoginButton=true
 oidc.provider={{ XWIKI_OIDC_PROVIDER }}
 oidc.endpoint.authorization={{ XWIKI_OIDC_AUTHORIZATION }}
 oidc.endpoint.token={{ XWIKI_OIDC_TOKEN }}
diff --git a/roles/web-app-xwiki/vars/main.yml b/roles/web-app-xwiki/vars/main.yml
index 5e599f95..53e428f7 100644
--- a/roles/web-app-xwiki/vars/main.yml
+++ b/roles/web-app-xwiki/vars/main.yml
@@ -1,9 +1,10 @@
 # General
 application_id:                       "web-app-xwiki"
 database_type:                        "{{ applications | get_app_conf(application_id, 'docker.services.database.type') }}"
+domain:                               "{{ domains | get_domain(application_id) }}"
 
 container_port:                       8080
-container_hostname:                   "{{ domains | get_domain(application_id) }}"
+container_hostname:                   "{{ domain }}"
 
 # XWiki