diff --git a/plugins/filter/compose_volumes.py b/plugins/filter/compose_volumes.py
index a0bb0f2780..4692129a55 100644
--- a/plugins/filter/compose_volumes.py
+++ b/plugins/filter/compose_volumes.py
@@ -255,7 +255,8 @@ def compose_volumes(
         if vtype == "config":
             source = _maybe_render(entry.get("source", ""), render_jinja)
             configs[semantic_name] = {
-                "name": _config_secret_name(role_entity, semantic_name, source),
+                "name": _maybe_render(entry.get("name", ""), render_jinja)
+                or _config_secret_name(role_entity, semantic_name, source),
                 "file": source,
             }
             continue
@@ -263,7 +264,8 @@ def compose_volumes(
         if vtype == "secret":
             source = _maybe_render(entry.get("source", ""), render_jinja)
             secrets[semantic_name] = {
-                "name": _config_secret_name(role_entity, semantic_name, source),
+                "name": _maybe_render(entry.get("name", ""), render_jinja)
+                or _config_secret_name(role_entity, semantic_name, source),
                 "file": source,
             }
             continue
diff --git a/roles/web-app-xwiki/meta/volumes.yml b/roles/web-app-xwiki/meta/volumes.yml
index ba9b386f85..433c0bd9de 100644
--- a/roles/web-app-xwiki/meta/volumes.yml
+++ b/roles/web-app-xwiki/meta/volumes.yml
@@ -8,6 +8,7 @@ data:
 
 properties:
   type: config
+  name: "xwiki_properties_{{ 'oidc' if xwiki_oidc_enabled_switch | default(false) | bool else 'std' }}"
   source: "{{ [lookup('container', 'web-app-xwiki', 'directories.config'), 'xwiki.properties'] | path_join }}"
   mode: "0440"
   mounts: