diff --git a/README.md b/README.md
index bec9892..2eb579f 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@
   * [matrix_group](#matrix_group)
   * [matrix_extra_groups](#matrix_extra_groups)
   * [matrix_packages](#matrix_packages)
+  * [matrix_packages_extra](#matrix_packages_extra)
   * [matrix_base_dir](#matrix_base_dir)
   * [matrix_conf_dir](#matrix_conf_dir)
   * [matrix_data_dir](#matrix_data_dir)
@@ -40,15 +41,14 @@
   * [matrix_ldap_auth_uid_attr](#matrix_ldap_auth_uid_attr)
   * [matrix_ldap_auth_mail_attr](#matrix_ldap_auth_mail_attr)
   * [matrix_ldap_auth_name_attr](#matrix_ldap_auth_name_attr)
-  * [matrix_postgres_enabled](#matrix_postgres_enabled)
-  * [matrix_postgres_ssl_mode](#matrix_postgres_ssl_mode)
-  * [matrix_postgres_ssl_root_cert](#matrix_postgres_ssl_root_cert)
-  * [matrix_postgres_server](#matrix_postgres_server)
-  * [matrix_postgres_port](#matrix_postgres_port)
-  * [matrix_postgres_superuser](#matrix_postgres_superuser)
-  * [matrix_postgres_password](#matrix_postgres_password)
-  * [matrix_postgres_db](#matrix_postgres_db)
-  * [matrix_postgres_user](#matrix_postgres_user)
+  * [matrix_db_type](#matrix_db_type)
+  * [matrix_db_server](#matrix_db_server)
+  * [matrix_db_port](#matrix_db_port)
+  * [matrix_db_name](#matrix_db_name)
+  * [matrix_db_user](#matrix_db_user)
+  * [matrix_db_password](#matrix_db_password)
+  * [matrix_db_ssl_mode](#matrix_db_ssl_mode)
+  * [matrix_db_ssl_root_cert](#matrix_db_ssl_root_cert)
   * [matrix_iptables_enabled](#matrix_iptables_enabled)
   * [matrix_open_ports](#matrix_open_ports)
   * [matrix_url_preview_enabled](#matrix_url_preview_enabled)
@@ -112,6 +112,8 @@ matrix_extra_groups: []
 
 ### matrix_packages
 
+Ensure EPEL repo is available at this server
+
 #### Default value
 
 ```YAML
@@ -132,6 +134,14 @@ matrix_packages:
   - openssl-devel
 ```
 
+### matrix_packages_extra
+
+#### Default value
+
+```YAML
+matrix_packages_extra: []
+```
+
 ### matrix_base_dir
 
 #### Default value
@@ -366,95 +376,70 @@ matrix_ldap_auth_mail_attr: email
 matrix_ldap_auth_name_attr: cn
 ```
 
-### matrix_postgres_enabled
+### matrix_db_type
+
+Sopported values are `pgsql` and `sqlite`.
 
 #### Default value
 
 ```YAML
-matrix_postgres_enabled: false
+matrix_db_type: pgsql
 ```
 
-### matrix_postgres_ssl_mode
+### matrix_db_server
 
 #### Default value
 
 ```YAML
-matrix_postgres_ssl_mode: disable
+matrix_db_server: localhost
 ```
 
-### matrix_postgres_ssl_root_cert
+### matrix_db_port
 
 #### Default value
 
 ```YAML
-matrix_postgres_ssl_root_cert: /etc/pki/tls/certs/ca-bundle.trust.crt
+matrix_db_port: 5432
 ```
 
-### matrix_postgres_server
+### matrix_db_name
 
 #### Default value
 
 ```YAML
-matrix_postgres_server: postgres.example.com
+matrix_db_name: matrix
 ```
 
-### matrix_postgres_port
+### matrix_db_user
 
 #### Default value
 
 ```YAML
-matrix_postgres_port: 5432
+matrix_db_user: pgmatrix
 ```
 
-### matrix_postgres_superuser
+### matrix_db_password
 
 #### Default value
 
 ```YAML
-matrix_postgres_superuser: postgres
+matrix_db_password: secure
 ```
 
-### matrix_postgres_password
+### matrix_db_ssl_mode
 
 #### Default value
 
 ```YAML
-matrix_postgres_password: secure
+matrix_db_ssl_mode: disable
 ```
 
-### matrix_postgres_db
+### matrix_db_ssl_root_cert
 
 #### Default value
 
 ```YAML
-matrix_postgres_db:
-  name: matrix
-  lc_collate: en_US.UTF-8
-  lc_ctype: en_US.UTF-8'
-  encoding: UTF-8
-  template: template0
-  login_host: localhost
-  login_user: '{{ matrix_postgres_superuser }}'
-  login_password: '{{ matrix_postgres_password }}'
-  port: '{{ matrix_postgres_port }}'
-  state: present
-```
-
-### matrix_postgres_user
-
-#### Default value
-
-```YAML
-matrix_postgres_user:
-  name: pgmatrix
-  password: matrix
-  encrypted: yes
-  db: '{{ matrix_postgres_db.name }}'
-  login_host: localhost
-  login_user: '{{ matrix_postgres_superuser }}'
-  login_password: '{{ matrix_postgres_password }}'
-  port: '{{ matrix_postgres_port }}'
-  state: present
+matrix_db_ssl_root_cert: /etc/pki/tls/certs/ca-bundle.trust.crt
 ```
 
 ### matrix_iptables_enabled