diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh
index 9eb90f5dfdea834013ec5e9c2f44943bc276e614..115235e047d1567d3efc0ba6cf51a3349d9a0258 100755
--- a/scripts/postinstall.sh
+++ b/scripts/postinstall.sh
@@ -24,7 +24,6 @@ docker-compose exec -T --user www-data nextcloud php occ db:convert-filecache-bi
 
 # Nextcloud resets trusted_domains to localhost during installation, so we have to set it again
 docker-compose exec -T --user www-data nextcloud php occ config:system:set trusted_domains 0 --value="$DOMAIN"
-docker-compose exec -T --user www-data nextcloud php occ app:disable theming
 
 # Set background jobs to use system cron
 docker-compose exec -T --user www-data nextcloud php /var/www/html/occ background:cron
@@ -41,7 +40,7 @@ docker-compose exec -T --user www-data nextcloud php /var/www/html/occ maintenan
 echo "Enabling nextcloud apps"
 docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable calendar
 docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable notes
-docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable user_backend_sql_raw
+docker-compose exec -T --user www-data nextcloud php /var/www/html/occ -f app:enable user_backend_sql_raw
 docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable snappymail
 docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable quota_warning
 docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable contacts
@@ -49,7 +48,8 @@ docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enabl
 docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable email-recovery
 docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable ecloud-accounts
 docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable ecloud-theme-helper
-docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable ecloud-dashboard
+docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable selfhost-theme-helper
+docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable murena-dashboard
 docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable murena_launcher
 docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:disable firstrunwizard
 docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:app:set snappymail snappymail-autologin-with-email --value 1
@@ -58,7 +58,7 @@ docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:insta
 
 docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:system:set integrity.check.disabled --value='true' --type=boolean
 
-docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:system:set defaultapp --value "ecloud-dashboard,files"
+docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:system:set defaultapp --value "murena-dashboard,files"
 
 echo "Installing custom ecloud drop account plugin"
 # Add WELCOME_SECRET from .env file as a system config value, to be used by our ecloud-accounts plugin
@@ -66,9 +66,14 @@ docker-compose exec -T --user www-data nextcloud php occ config:system:set e_wel
 # Add VHOST_ACCOUNTS from .env file as a system config value, to be used by our ecloud-accounts plugin
 docker-compose exec -T --user www-data nextcloud php occ config:system:set e_welcome_domain --value="welcome.$DOMAIN"
 
+echo "Performing some Nextcloud administrative tasks"
 # Add missing indices
 docker-compose exec -T --user www-data nextcloud php /var/www/html/occ db:add-missing-indices
 
+# Set default domain
+docker exec -u www-data nextcloud /var/www/html/occ config:system:set main_domain --value $DOMAIN
+docker exec -u www-data nextcloud /var/www/html/occ config:system:set legacy_domain --value $DOMAIN
+
 docker-compose exec -T --user www-data nextcloud php occ maintenance:mode --off
 
 # define all default preview providers AND the video preview provider, now that ffmpeg is bundled in the image