diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 4cc380df6..be09c7bae 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -1088,6 +1088,9 @@ matrix_bot_maubot_registration_shared_secret: |-
     }[matrix_homeserver_implementation]
   }}
 
+# Postgres is the default, except if not using `matrix_postgres` (internal postgres)
+matrix_bot_maubot_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
+matrix_bot_maubot_database_password: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'mxpup.dsc.db') | to_uuid }}"
 
 ######################################################################
 #
@@ -1805,6 +1808,12 @@ matrix_postgres_additional_databases: |
       'password': matrix_bot_honoroit_database_password,
     }] if (matrix_bot_honoroit_enabled and matrix_bot_honoroit_database_engine == 'postgres' and matrix_bot_honoroit_database_hostname == 'matrix-postgres') else [])
     +
+    ([{
+      'name': matrix_bot_maubot_database_name,
+      'username': matrix_bot_maubot_database_username,
+      'password': matrix_bot_maubot_database_password,
+    }] if (matrix_bot_maubot_enabled  and matrix_bot_maubot_database_engine == 'postgres' and matrix_bot_maubot_database_hostname == 'matrix-postgres') else [])
+    +
     ([{
       'name': matrix_bot_buscarron_database_name,
       'username': matrix_bot_buscarron_database_username,
diff --git a/roles/matrix-bot-maubot/defaults/main.yml b/roles/matrix-bot-maubot/defaults/main.yml
index d15a451fa..294cd8684 100644
--- a/roles/matrix-bot-maubot/defaults/main.yml
+++ b/roles/matrix-bot-maubot/defaults/main.yml
@@ -17,7 +17,16 @@ 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_database_uri: 'sqlite:////data/maubot.db'
+matrix_bot_maubot_database_engine: sqlite
+matrix_bot_maubot_sqlite_database_path_local: "{{ matrix_bot_maubot_data_path }}/maubot.db"
+matrix_bot_maubot_sqlite_database_path_in_container: "/data/maubot.db"
+
+matrix_bot_maubot_database_username: matrix_bot_maubot
+matrix_bot_maubot_database_password: ~
+matrix_bot_maubot_database_hostname: 'matrix-postgres'
+matrix_bot_maubot_database_port: 5432
+matrix_bot_maubot_database_name: matrix_bot_maubot
+
 matrix_bot_maubot_port: 29316
 matrix_bot_maubot_secret: 'generate'