diff --git a/scripts/init-repo.sh b/scripts/init-repo.sh
index 3b98f68e34f3c5500ffb1e2016008cfed4efcab7..156ddcc75a3c553fc7ff8a8dfc12f26b7a2682c4 100755
--- a/scripts/init-repo.sh
+++ b/scripts/init-repo.sh
@@ -141,4 +141,6 @@ touch /mnt/repo-base/volumes/accounts/auth.file.done
 ACCOUNTS_UID=$(docker-compose exec --user www-data accounts id -u | tr -d '\r')
 chown "$ACCOUNTS_UID:$ACCOUNTS_UID" /mnt/repo-base/volumes/accounts/auth.file.done
 
+sleep 300
+
 bash scripts/postinstall.sh
diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh
index c22abecb50bf94577d9ca27872c8047976e2984d..73c44db33c5e26a7f0e88c37418638d430a2c7ac 100755
--- a/scripts/postinstall.sh
+++ b/scripts/postinstall.sh
@@ -3,10 +3,6 @@ set -e
 
 source /mnt/repo-base/scripts/base.sh
 
-docker-compose exec -T --user www-data nextcloud php occ maintenance:install \
-    --admin-user="$NEXTCLOUD_ADMIN_USER" --admin-pass="$NEXTCLOUD_ADMIN_PASSWORD" \
-    --admin-email="$ALT_EMAIL" --database="mysql"
-
 docker-compose exec -T --user www-data nextcloud php occ maintenance:mode --on
 docker-compose exec -T --user www-data nextcloud php occ db:add-missing-indices
 docker-compose exec -T --user www-data nextcloud php occ db:convert-filecache-bigint --no-interaction
diff --git a/templates/docker-compose/docker-compose-base.yml b/templates/docker-compose/docker-compose-base.yml
index b2e29729805608b8a4e4df357dd0967cf8a21da9..69c99e5a8b124f81df3dbcfc4dd2c328b4544c14 100644
--- a/templates/docker-compose/docker-compose-base.yml
+++ b/templates/docker-compose/docker-compose-base.yml
@@ -78,10 +78,11 @@ services:
       - /mnt/repo-base/volumes/redis/db:/data
 
   accounts:
-        image: registry.gitlab.e.foundation:5000/e/infra/docker-welcome:0.2.0
+        image: registry.gitlab.e.foundation:5000/e/infra/docker-welcome:0.3.0
         container_name: accounts
         environment:
          - DOMAINS=${VHOSTS_ACCOUNTS}
+         - DOMAIN=${DOMAIN}
          - IS_WELCOME=true
          - PFDB_HOST=mariadb
          - PFDB_DB=${PFDB_DB}