diff --git a/inventory/group_vars/9iron.club.yml b/inventory/group_vars/9iron.club.yml
index eb78061..67b7132 100644
--- a/inventory/group_vars/9iron.club.yml
+++ b/inventory/group_vars/9iron.club.yml
@@ -107,13 +107,15 @@ matrix:
             63316265366238383038653034326661633163346462396663346563666134393232
 # Nextcloud
 nextcloud:
-  db_password: !vault |
-            $ANSIBLE_VAULT;1.1;AES256
-            37633035633563646266346264333636393931323664313166633133653461646333643731636661
-            3966666665396239346662613764353333393038663762340a313236396331623061376462356437
-            66373234633939393034353439393465663131303661393164303335336435653734613064663964
-            3332313764623133630a393731613236373837316437653265636663666261383135636662373566
-            61373135303632336237333836353764646639633735323566346366623766646266
+  db:
+    hostname: 172.31.47.215
+    pass: !vault |
+              $ANSIBLE_VAULT;1.1;AES256
+              37633035633563646266346264333636393931323664313166633133653461646333643731636661
+              3966666665396239346662613764353333393038663762340a313236396331623061376462356437
+              66373234633939393034353439393465663131303661393164303335336435653734613064663964
+              3332313764623133630a393731613236373837316437653265636663666261383135636662373566
+              61373135303632336237333836353764646639633735323566346366623766646266
   efs:
     name: "9iron-nextcloud"
     region: "us-east-2"
diff --git a/roles/nextcloud/meta/main.yml b/roles/nextcloud/meta/main.yml
index d5f3152..7e415bc 100644
--- a/roles/nextcloud/meta/main.yml
+++ b/roles/nextcloud/meta/main.yml
@@ -2,4 +2,3 @@
 allow_duplicates: no
 dependencies:
   - role: apache-php
-  - role: mysql
diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
index f7e8662..1ebbe9b 100644
--- a/roles/nextcloud/tasks/main.yml
+++ b/roles/nextcloud/tasks/main.yml
@@ -8,7 +8,27 @@
       name:
         - php-imagick
         - php-redis
+        - php-pgsql
     notify: restart apache
+  - name: Set up PostgreSQL
+    block:
+      - name: Create DB user
+        postgresql_user:
+          name: nextcloud
+          password: "{{ nextcloud.db.pass }}"
+          login_host: "{{ nextcloud.db.hostname }}"
+          login_user: "{{ psql.ansible.user }}"
+          login_password: "{{ psql.ansible.pass }}"
+      - name: Create DB
+        postgresql_db:
+          name: nextcloud
+          owner: nextcloud
+          encoding: UNICODE
+          login_host: "{{ nextcloud.db.hostname }}"
+          login_user: "{{ psql.ansible.user }}"
+          login_password: "{{ psql.ansible.pass }}"
+    when: nextcloud.db.hostname is defined
+    tags: [ postgresql ]
   - name: Set up MySQL
     block:
       - name: Create database