diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 932b288ad..fda40efdf 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -1317,9 +1317,8 @@ matrix_registration_systemd_required_services_list: |
     (['matrix-postgres.service'] if matrix_postgres_enabled else [])
   }}
 
-# We'd like to use 'postgres' if matrix_postgres_enabled, but the container image doesn't seem to support that.
-# Learn more here: https://github.com/ZerataX/matrix-registration/issues/44
-matrix_registration_database_engine: 'sqlite'
+# Postgres is the default, except if not using `matrix_postgres` (internal postgres)
+matrix_registration_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
 matrix_registration_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'mx.registr.db') | to_uuid }}"
 
 ######################################################################
diff --git a/roles/matrix-registration/defaults/main.yml b/roles/matrix-registration/defaults/main.yml
index b39f02c46..d85faf89a 100644
--- a/roles/matrix-registration/defaults/main.yml
+++ b/roles/matrix-registration/defaults/main.yml
@@ -88,7 +88,6 @@ matrix_registration_admin_secret: ""
 
 matrix_registration_riot_instance: "https://riot.im/app/"
 
-
 # Default matrix-registration configuration template which covers the generic use case.
 # You can customize it by controlling the various variables inside it.
 #
diff --git a/roles/matrix-registration/tasks/setup_install.yml b/roles/matrix-registration/tasks/setup_install.yml
index 489bab8ba..708cb1df5 100644
--- a/roles/matrix-registration/tasks/setup_install.yml
+++ b/roles/matrix-registration/tasks/setup_install.yml
@@ -18,6 +18,11 @@
               engine_variable_name: 'matrix_registration_database_engine'
               engine_old: 'sqlite'
               systemd_services_to_stop: ['matrix-registration.service']
+              # pgloader makes `ex_date` of type `TIMESTAMP WITH TIMEZONE`,
+              # which makes matrix-registration choke on it later on when comparing dates.
+              additional_psql_statements_list:
+                - ALTER TABLE tokens ALTER COLUMN ex_date TYPE TIMESTAMP WITHOUT TIME ZONE;
+              additional_psql_statements_db_name: "{{ matrix_registration_database_db_name }}"
 
         - import_tasks: "roles/matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
 
diff --git a/roles/matrix-registration/tasks/validate_config.yml b/roles/matrix-registration/tasks/validate_config.yml
index 80293bcba..90466b46c 100644
--- a/roles/matrix-registration/tasks/validate_config.yml
+++ b/roles/matrix-registration/tasks/validate_config.yml
@@ -18,10 +18,3 @@
   when: "item.old in vars"
   with_items:
     - {'old': 'matrix_registration_docker_repo', 'new': 'matrix_registration_container_image_self_build_repo'}
-
-- name: Fail if Postgres usage attempted
-  fail:
-    msg: >
-      matrix-registration doesn't support using Postgres just yet.
-      Learn more here: https://github.com/ZerataX/matrix-registration/issues/44
-  when: "matrix_registration_database_engine == 'postgres'"