diff --git a/roles/web-app-xwiki/templates/docker-compose.yml.j2 b/roles/web-app-xwiki/templates/docker-compose.yml.j2
index eb296354..47ce7ceb 100644
--- a/roles/web-app-xwiki/templates/docker-compose.yml.j2
+++ b/roles/web-app-xwiki/templates/docker-compose.yml.j2
@@ -6,7 +6,6 @@
     image: "{{ XWIKI_IMAGE_CUSTOM }}"
     container_name: "{{ XWIKI_CONTAINER }}"
     hostname: '{{ XWIKI_HOSTNAME}}'
-    command: ["all"]
     ports:
       - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}"
     volumes:
diff --git a/roles/web-app-xwiki/templates/env.j2 b/roles/web-app-xwiki/templates/env.j2
index 3f6aab0d..65d9551a 100644
--- a/roles/web-app-xwiki/templates/env.j2
+++ b/roles/web-app-xwiki/templates/env.j2
@@ -1,6 +1,8 @@
 DB_USER="{{ database_username }}"
 DB_PASSWORD="{{ database_password }}"
 DB_HOST="{{ database_host }}"
+DB_PORT="{{ database_port }}"
+DB_DATABASE="{{ database_name }}"
 
 ### Pretix core
 #XWIKI_XWIKI_INSTANCE_NAME="{{ PRIMARY_DOMAIN | upper }} Tickets"
@@ -11,24 +13,6 @@ DB_HOST="{{ database_host }}"
 ### Locale
 #XWIKI_LOCALE_TIMEZONE="{{ HOST_TIMEZONE }}"
 #
-### Database
-#XWIKI_DATABASE_BACKEND="postgresql"
-#XWIKI_DATABASE_NAME="{{ database_name }}"
-#XWIKI_DATABASE_USER="{{ database_username }}"
-#XWIKI_DATABASE_PASSWORD="{{ database_password }}"
-#XWIKI_DATABASE_HOST="{{ database_host }}"
-#XWIKI_DATABASE_PORT="{{ database_port }}"
-#XWIKI_WEB_CONCURRENCY="{{ POSTGRES_ALLOWED_AVG_CONNECTIONS }}"
-#XWIKI_WORKER_THREADS="{{ (POSTGRES_ALLOWED_AVG_CONNECTIONS | int // 2 ) }}"
-#
-#{% if XWIKI_REDIS_ENABLED %}
-### Redis
-#XWIKI_REDIS_SESSIONS="true"
-#XWIKI_REDIS_LOCATION="redis://redis:6379/{{ XWIKI_REDIS_CACHE_DB }}"
-#CELERY_BROKER_URL="redis://redis:6379/{{ XWIKI_REDIS_BROKER_DB }}"
-#CELERY_RESULT_BACKEND="redis://redis:6379/{{ XWIKI_REDIS_RESULT_DB }}"
-#{% endif %}
-#
 #{% if XWIKI_OIDC_ENABLED %}
 ### OIDC (plugin)
 #XWIKI_OIDC_TITLE="{{ XWIKI_OIDC_LABEL | replace('\"','\\\"') }}"
diff --git a/roles/web-app-xwiki/vars/main.yml b/roles/web-app-xwiki/vars/main.yml
index 42f2845e..5c4979d8 100644
--- a/roles/web-app-xwiki/vars/main.yml
+++ b/roles/web-app-xwiki/vars/main.yml
@@ -1,6 +1,6 @@
 # General
 application_id:                 "web-app-xwiki"
-database_type:                  "postgres"
+database_type:                  "mariadb"
 container_port:                 8080
 container_hostname:             "{{ domains | get_domain(application_id) }}"