diff --git a/roles/matrix-bridge-mautrix-wsproxy/defaults/main.yml b/roles/matrix-bridge-mautrix-wsproxy/defaults/main.yml
index 0ecf65140..f66e17f8b 100644
--- a/roles/matrix-bridge-mautrix-wsproxy/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-wsproxy/defaults/main.yml
@@ -29,45 +29,6 @@ matrix_mautrix_wsproxy_homeserver_token: ''
 
 matrix_mautrix_wsproxy_appservice_bot_username: wsproxy
 
-
-# Database-related configuration fields.
-#
-# To use SQLite, stick to these defaults.
-#
-# To use Postgres:
-# - change the engine (`matrix_mautrix_wsproxy_database_engine: 'postgres'`)
-# - adjust your database credentials via the `matrix_mautrix_wsproxy_postgres_*` variables
-matrix_mautrix_wsproxy_database_engine: 'sqlite'
-
-matrix_mautrix_wsproxy_sqlite_database_path_local: "{{ matrix_mautrix_wsproxy_data_path }}/mautrix-wsproxy.db"
-matrix_mautrix_wsproxy_sqlite_database_path_in_container: "/data/mautrix-wsproxy.db"
-
-matrix_mautrix_wsproxy_database_username: 'matrix_mautrix_wsproxy'
-matrix_mautrix_wsproxy_database_password: 'some-password'
-matrix_mautrix_wsproxy_database_hostname: 'matrix-postgres'
-matrix_mautrix_wsproxy_database_port: 5432
-matrix_mautrix_wsproxy_database_name: 'matrix_mautrix_wsproxy'
-
-matrix_mautrix_wsproxy_database_connection_string: 'postgresql://{{ matrix_mautrix_wsproxy_database_username }}:{{ matrix_mautrix_wsproxy_database_password }}@{{ matrix_mautrix_wsproxy_database_hostname }}:{{ matrix_mautrix_wsproxy_database_port }}/{{ matrix_mautrix_wsproxy_database_name }}?sslmode=disable'
-
-matrix_mautrix_wsproxy_appservice_database_type: "{{
-	{
-		'sqlite': 'sqlite3',
-		'postgres':'postgres',
-	}[matrix_mautrix_wsproxy_database_engine]
-}}"
-
-matrix_mautrix_wsproxy_appservice_database_uri: "{{
-	{
-		'sqlite': matrix_mautrix_wsproxy_sqlite_database_path_in_container,
-		'postgres': matrix_mautrix_wsproxy_database_connection_string,
-	}[matrix_mautrix_wsproxy_database_engine]
-}}"
-
-
-# Can be set to enable automatic double-puppeting via Shared Secret Auth (https://github.com/devture/matrix-synapse-shared-secret-auth).
-matrix_mautrix_wsproxy_login_shared_secret: ''
-
 # Default mautrix-wsproxy configuration template which covers the generic use case.
 # You can customize it by controlling the various variables inside it.
 #
diff --git a/roles/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml
index 214bdcc8c..77f400479 100644
--- a/roles/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml
@@ -11,30 +11,6 @@
 - set_fact:
     matrix_mautrix_wsproxy_requires_restart: false
 
-- block:
-    - name: Check if an SQLite database already exists
-      stat:
-        path: "{{ matrix_mautrix_wsproxy_sqlite_database_path_local }}"
-      register: matrix_mautrix_wsproxy_sqlite_database_path_local_stat_result
-
-    - block:
-        - set_fact:
-            matrix_postgres_db_migration_request:
-              src: "{{ matrix_mautrix_wsproxy_sqlite_database_path_local }}"
-              dst: "{{ matrix_mautrix_wsproxy_database_connection_string }}"
-              caller: "{{ role_path|basename }}"
-              engine_variable_name: 'matrix_mautrix_wsproxy_database_engine'
-              engine_old: 'sqlite'
-              systemd_services_to_stop: ['matrix-mautrix-wsproxy.service']
-              pgloader_options: ['--with "quote identifiers"']
-
-        - import_tasks: "{{ role_path }}/../matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
-
-        - set_fact:
-            matrix_mautrix_wsproxy_requires_restart: true
-      when: "matrix_mautrix_wsproxy_sqlite_database_path_local_stat_result.stat.exists|bool"
-  when: "matrix_mautrix_wsproxy_database_engine == 'postgres'"
-
 - name: Ensure Mautrix wsproxy image is pulled
   docker_image:
     name: "{{ matrix_mautrix_wsproxy_docker_image }}"
@@ -54,24 +30,11 @@
     - "{{ matrix_mautrix_wsproxy_config_path }}"
     - "{{ matrix_mautrix_wsproxy_data_path }}"
 
-- name: Check if an old database file exists
-  stat:
-    path: "{{ matrix_mautrix_wsproxy_base_path }}/mautrix-wsproxy.db"
-  register: matrix_mautrix_wsproxy_stat_database
-
 - name: Check if an old matrix state file exists
   stat:
     path: "{{ matrix_mautrix_wsproxy_base_path }}/mx-state.json"
   register: matrix_mautrix_wsproxy_stat_mx_state
 
-- name: (Data relocation) Ensure matrix-mautrix-wsproxy.service is stopped
-  service:
-    name: matrix-mautrix-wsproxy
-    state: stopped
-    daemon_reload: yes
-  failed_when: false
-  when: "matrix_mautrix_wsproxy_stat_database.stat.exists"
-
 - name: (Data relocation) Move mautrix-wsproxy database file to ./data directory
   command: "mv {{ matrix_mautrix_wsproxy_base_path }}/mautrix-wsproxy.db {{ matrix_mautrix_wsproxy_data_path }}/mautrix-wsproxy.db"
   when: "matrix_mautrix_wsproxy_stat_database.stat.exists"
diff --git a/roles/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-whatsapp.service.j2 b/roles/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-wsproxy.service.j2
similarity index 100%
rename from roles/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-whatsapp.service.j2
rename to roles/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-wsproxy.service.j2