diff --git a/roles/matrix-bot-maubot/defaults/main.yml b/roles/matrix-bot-maubot/defaults/main.yml
index 9d273053..210fb193 100644
--- a/roles/matrix-bot-maubot/defaults/main.yml
+++ b/roles/matrix-bot-maubot/defaults/main.yml
@@ -17,11 +17,9 @@ matrix_bot_maubot_bot_server_public: "https://{{ matrix_server_fqn_matrix }}"
 matrix_bot_maubot_proxy_management_interface: false
 matrix_bot_maubot_expose_management_interface: true
 
-
-matrix_bot_maubot_secret: ''
-matrix_bot_maubot_admin_user: ''
-matrix_bot_maubot_admin_password: ''
-matrix_mau_environment_variables_extension: ''
+matrix_bot_database_uri: 'sqlite:///data/maubot.db'
+matrix_bot_maubot_port: 29316
+matrix_bot_maubot_secret: 'generate'
 
 # A list of extra arguments to pass to the container
 matrix_bot_maubot_container_extra_arguments: []
diff --git a/roles/matrix-bot-maubot/tasks/setup_install.yml b/roles/matrix-bot-maubot/tasks/setup_install.yml
index 3b2ce5b7..6d9aec87 100644
--- a/roles/matrix-bot-maubot/tasks/setup_install.yml
+++ b/roles/matrix-bot-maubot/tasks/setup_install.yml
@@ -26,15 +26,15 @@
     matrix_bot_maubot_matrix_nginx_proxy_configuration: |
       location ~ ^/(_matrix/maubot/.*) {
       {% if matrix_nginx_proxy_enabled|default(False) %}
-      	{# Use the embedded DNS resolver in Docker containers to discover the service #}
-      	resolver 127.0.0.11 valid=5s;
-      	set $backend "matrix-maubot:{{ matrix_bot_maubot_port }}/$1";
-      	proxy_pass http://$backend;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
+        {# Use the embedded DNS resolver in Docker containers to discover the service #}
+         resolver 127.0.0.11 valid=5s;
+         set $backend "matrix-bot-maubot:29316/$1";
+         proxy_pass http://$backend;
+         proxy_set_header Upgrade $http_upgrade;
+         proxy_set_header Connection "upgrade";
       {% else %}
-      	{# Generic configuration for use outside of our container setup #}
-      	proxy_pass http://127.0.0.1:{{ matrix_bot_maubot_port }}/$1;
+        {# Generic configuration for use outside of our container setup #}
+        proxy_pass http://127.0.0.1:{{ matrix_bot_maubot_port }}/$1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
       {% endif %}
diff --git a/roles/matrix-bot-maubot/templates/config/config.yaml.j2 b/roles/matrix-bot-maubot/templates/config/config.yaml.j2
index eb9e7abf..aa9a2045 100644
--- a/roles/matrix-bot-maubot/templates/config/config.yaml.j2
+++ b/roles/matrix-bot-maubot/templates/config/config.yaml.j2
@@ -3,12 +3,12 @@
 # Format examples:
 #   SQLite:   sqlite:///filename.db
 #   Postgres: postgresql://username:password@hostname/dbname
-database: {{ matrix_bot_maubot_storage_database|to_json }}
+database: {{ matrix_bot_maubot_database_uri|to_json }}
 
 # Separate database URL for the crypto database. "default" means use the same database as above.
 crypto_database: 
     type: default
-    postgres_uri: {{ matrix_bot_maubot_storage_database|to_json }}
+    postgres_uri: {{ matrix_bot_maubot_database_uri|to_json }}
 
 # Additional arguments for asyncpg.create_pool() or sqlite3.connect()
 # https://magicstack.github.io/asyncpg/current/api/index.html#asyncpg.pool.create_pool