diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 8dd40a210..c39c7d556 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -1118,10 +1118,14 @@ matrix_mautrix_signalgo_systemd_required_services_list: |
     (['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else [])
   }}
 
-matrix_mautrix_signalgo_appservice_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'sigo.as.token', rounds=655555) | to_uuid }}"
+matrix_mautrix_signalgo_homeserver_domain: "{{ matrix_domain }}"
+
+matrix_mautrix_signalgo_homeserver_address: "{{ matrix_homeserver_container_url }}"
 
 matrix_mautrix_signalgo_homeserver_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'sigo.hs.token', rounds=655555) | to_uuid }}"
 
+matrix_mautrix_signalgo_appservice_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'sigo.as.token', rounds=655555) | to_uuid }}"
+
 matrix_mautrix_signalgo_login_shared_secret: "{{ matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret if matrix_synapse_ext_password_provider_shared_secret_auth_enabled else '' }}"
 
 # People using an external Prometheus server will need to toggle all of these to be able to consume metrics remotely:
@@ -1130,10 +1134,9 @@ matrix_mautrix_signalgo_login_shared_secret: "{{ matrix_synapse_ext_password_pro
 # - `matrix_nginx_proxy_proxy_matrix_metrics_enabled`
 matrix_mautrix_signalgo_metrics_enabled: "{{ prometheus_enabled }}"
 
-# Postgres is the default, except if not using internal Postgres server
 matrix_mautrix_signalgo_database_engine: "{{ 'postgres' if devture_postgres_enabled else 'sqlite' }}"
 matrix_mautrix_signalgo_database_hostname: "{{ devture_postgres_connection_hostname if devture_postgres_enabled else '' }}"
-matrix_mautrix_signalgo_database_password: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'mausignalgo.db', rounds=655555) | to_uuid }}"
+matrix_mautrix_signalgo_database_password: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'mau.signalgo.db', rounds=655555) | to_uuid }}"
 
 ######################################################################
 #
diff --git a/roles/custom/matrix-bridge-mautrix-signalgo/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-signalgo/defaults/main.yml
index 788c3f0bb..6c19d0a3d 100644
--- a/roles/custom/matrix-bridge-mautrix-signalgo/defaults/main.yml
+++ b/roles/custom/matrix-bridge-mautrix-signalgo/defaults/main.yml
@@ -9,7 +9,7 @@ matrix_mautrix_signalgo_container_image_self_build_repo: "https://mau.dev/mautri
 matrix_mautrix_signalgo_container_image_self_build_branch: "{{ 'main' if matrix_mautrix_signalgo_version == 'latest' else matrix_mautrix_signalgo_version }}"
 
 # renovate: datasource=docker depName=dock.mau.dev/mautrix/signalgo
-matrix_mautrix_signalgo_version: 3953789ef00f5f521a26b4463aaee95aa8a929b9-amd64
+matrix_mautrix_signalgo_version: 63b24c86d1bcd87f20e830d7134cbb39f8de4e3f-amd64
 
 # See: https://mau.dev/mautrix/signalgo/container_registry
 matrix_mautrix_signalgo_docker_image: "{{ matrix_mautrix_signalgo_docker_image_name_prefix }}mautrix/signalgo:{{ matrix_mautrix_signalgo_version }}"
@@ -88,7 +88,7 @@ matrix_mautrix_signalgo_database_connection_string: 'postgresql://{{ matrix_maut
 
 matrix_mautrix_signalgo_appservice_database_type: "{{
 	{
-		'sqlite': 'sqlite3',
+		'sqlite': 'sqlite3-fk-wal',
 		'postgres':'postgres',
 	}[matrix_mautrix_signalgo_database_engine]
 }}"