diff --git a/defaults/main.yml b/defaults/main.yml
index 7c8ef7a..cff15e5 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -39,10 +39,10 @@ gitea_disable_registration: "true"
 
 gitea_postgres_enabled: False
 gitea_postgres_ssl_mode: disabled
-gitea_postgres_server: postgres.example.com
+gitea_postgres_server: "{{ inventory_hostname }}"
 gitea_postgres_port: 5432
 gitea_postgres_superuser: postgres
-gitea_postgres_password: secure
+gitea_postgres_password: postgres
 
 gitea_postgres_db:
   name: gitea
diff --git a/molecule/ec2-centos-7/playbook.yml b/molecule/ec2-centos-7/playbook.yml
index f1d295c..352bbe7 100644
--- a/molecule/ec2-centos-7/playbook.yml
+++ b/molecule/ec2-centos-7/playbook.yml
@@ -1,5 +1,16 @@
 ---
 - name: Converge
   hosts: all
+  vars:
+    postgres_repository_enabled: True
+    postgres_users:
+      - name: "postgres"
+        password: "postgres"
+        role_attr_flags: SUPERUSER
+        login_host: localhost
+        state: present
+        pam_user: True
+
   roles:
+    - role: xoxys.postgres
     - role: xoxys.gitea
diff --git a/requirements.yml b/requirements.yml
new file mode 100644
index 0000000..d9e1856
--- /dev/null
+++ b/requirements.yml
@@ -0,0 +1,5 @@
+---
+- src: https://gitea.rknet.org/ansible/xoxys.postgres.git
+  name: xoxys.postgres
+  scm: git
+  version: master
diff --git a/tasks/prepare.yml b/tasks/prepare.yml
index 655800f..8327f90 100644
--- a/tasks/prepare.yml
+++ b/tasks/prepare.yml
@@ -70,3 +70,4 @@
       no_log: True
       when: gitea_postgres_user is defined
   delegate_to: "{{ gitea_postgres_server }}"
+  when: gitea_postgres_enabled | bool