diff --git a/roles/web-app-xwiki/templates/xwiki.cfg.j2 b/roles/web-app-xwiki/templates/xwiki.cfg.j2
index 3d817e01..e1395506 100644
--- a/roles/web-app-xwiki/templates/xwiki.cfg.j2
+++ b/roles/web-app-xwiki/templates/xwiki.cfg.j2
@@ -17,7 +17,9 @@ xwiki.authentication.ldap.update_user=1
 {% else %}
 xwiki.authentication.authclass=com.xpn.xwiki.user.impl.xwiki.XWikiAuthServiceImpl
 {% endif %}
+
 {% if xwiki_superadmin_enabled_switch | bool %}
 # ---- Superadmin must live in xwiki.cfg (not in xwiki.properties)
 xwiki.superadminpassword={{ XWIKI_SUPERADMIN_PASSWORD }}
+xwiki.superadmin=1
 {% endif %}
diff --git a/roles/web-app-xwiki/templates/xwiki.properties.j2 b/roles/web-app-xwiki/templates/xwiki.properties.j2
index a5c5331b..4329be58 100644
--- a/roles/web-app-xwiki/templates/xwiki.properties.j2
+++ b/roles/web-app-xwiki/templates/xwiki.properties.j2
@@ -17,17 +17,14 @@ oidc.groups.claim={{ XWIKI_OIDC_GROUPS_CLAIM }}
 oidc.groups.mapping=XWiki.XWikiAdminGroup={{ XWIKI_OIDC_ADMIN_PROVIDER_GROUP }}
 {% endif %}
 
-############################################
-# Distribution Wizard (bootstrap)
-# Render this block only during bootstrap when we temporarily enable the superadmin.
-{% if xwiki_superadmin_enabled_switch | bool %}
 # Start DW automatically and non-interactively
 distribution.automaticStartOnMainWiki=true
 distribution.automaticStartOnWiki=true
 distribution.job.interactive=false
 # Default flavor for main wiki
 distribution.defaultUI=org.xwiki.platform:xwiki-platform-distribution-flavor-mainwiki
-{% endif %}
+distribution.skip=false
+distribution.wizard.enabled=true
 
 # Persist data in the Docker volume
 environment.permanentDirectory={{ XWIKI_DOCK_DATA_DIR }}