diff --git a/nextcloud/nextcloud-secret.json b/nextcloud/nextcloud-secret.json
index e11e7de..445b817 100644
--- a/nextcloud/nextcloud-secret.json
+++ b/nextcloud/nextcloud-secret.json
@@ -1,9 +1,9 @@
 {
-    "nextcloudmysql": {
-        "MARIADB_DATABASE": "#MARIADB_DATABASE",
-        "MARIADB_USER": "#MARIADB_USER",
-        "MARIADB_PASSWORD": "#MARIADB_PASSWORD",
-        "MARIADB_ROOT_PASSWORD": "#MARIADB_ROOT_PASSWORD"
+    "nextcloudpostgres": {
+        "POSTGRES_DB": "#POSTGRES_DB",
+        "POSTGRES_USER": "#POSTGRES_USER",
+        "POSTGRES_PASSWORD": "#POSTGRES_PASSWORD",
+        "POSTGRES_ROOT_PASSWORD": "#POSTGRES_ROOT_PASSWORD"
     },
     "nextcloudphp": {
         "NEXTCLOUD_ADMIN_USER": "#NEXTCLOUD_ADMIN_USER",
@@ -11,10 +11,10 @@
         "NEXTCLOUD_TRUSTED_DOMAINS": "#NEXTCLOUD_TRUSTED_DOMAINS",
         "OVERWRITEHOST": "#NEXTCLOUD_TRUSTED_DOMAINS",
         "NEXTCLOUD_DATA_DIR": "/var/data",
-        "MYSQL_DATABASE": "#MARIADB_DATABASE",
-        "MYSQL_USER": "#MARIADB_USER",
-        "MYSQL_PASSWORD": "#MARIADB_PASSWORD",
-        "MYSQL_HOST": "nextcloudmysql-db",
+        "POSTGRES_DB": "#POSTGRES_DB",
+        "POSTGRES_USER": "#POSTGRES_USER",
+        "POSTGRES_PASSWORD": "#POSTGRES_PASSWORD",
+        "POSTGRES_HOST": "nextcloudpostgres-db",
         "REDIS_HOST": "nextcloud-redis"
     }
 }
\ No newline at end of file
diff --git a/nextcloud/service-nextcloud.json b/nextcloud/service-nextcloud.json
index a5a2fbb..1d62c65 100644
--- a/nextcloud/service-nextcloud.json
+++ b/nextcloud/service-nextcloud.json
@@ -34,47 +34,31 @@
             "DEPEND": "null",
             "START_ON_BOOT": "false",
             "ENTRYPOINT": "sh -c",
-            "CMD": "mkdir -p /etc/user/data/nextcloud/db && mkdir -p /etc/system/log/nextcloud/db && mkdir -p /etc/user/data/nextcloud/apps && mkdir -p /etc/user/data/nextcloud/config && mkdir -p /etc/user/data/nextcloud/data && chmod 777 -R /etc/user/data/nextcloud && chmod 0770 -R /etc/user/data/nextcloud/data && chown -R 82:82 /etc/user/data/nextcloud/data && chown -R 82:82 /etc/user/data/nextcloud/apps && chown -R 82:82 /etc/user/data/nextcloud/config",
+            "CMD": "mkdir -p /etc/user/data/nextcloud/db && mkdir -p /etc/user/data/nextcloud/apps && mkdir -p /etc/user/data/nextcloud/config && mkdir -p /etc/user/data/nextcloud/data && chmod 777 -R /etc/user/data/nextcloud && chmod 0770 -R /etc/user/data/nextcloud/data && chown -R 82:82 /etc/user/data/nextcloud/data && chown -R 82:82 /etc/user/data/nextcloud/apps && chown -R 82:82 /etc/user/data/nextcloud/config",
             "PRE_START": "null",
             "POST_START": "null"
         },
         {
-            "IMAGE": "mariadb:10.5",
+            "IMAGE": "postgres:13-alpine",
             "UPDATE": "true",
-            "NAME": "nextcloudmysql-db",
+            "NAME": "nextcloudpostgres-db",
             "MEMORY": "256M",
             "NETWORK": "nextcloud-net",
-            "SELECTOR": "nextcloudmysql",
+            "SELECTOR": "nextcloudpostgres",
             "VOLUMES": [
                 {
                     "SOURCE": "/etc/user/data/nextcloud/db",
-                    "DEST": "/var/lib/mysql",
-                    "TYPE": "rw"
-                },
-                {
-                    "SOURCE": "/etc/system/log/nextcloud/db",
-                    "DEST": "/var/lib/mysql/mysql-bin",
+                    "DEST": "/var/lib/postgres",
                     "TYPE": "rw"
                 }
             ],
             "PORTS": [
                 {
                     "SOURCE": "null",
-                    "DEST": "3306",
+                    "DEST": "5432",
                     "TYPE": "tcp"
                 }
             ],
-            "READYNESS": [
-                {
-                    "tcp": "3306"
-                },
-                {
-                    "HTTP": ""
-                },
-                {
-                    "EXEC": "/ready.sh"
-                }
-            ],
             "ENV_FILES": [
                 "/etc/user/secret/nextcloud/nextcloud.json"
             ],
@@ -182,7 +166,7 @@
             ]
         },
         {
-            "IMAGE": "registry.format.hu/nextcloud-nginx:1.23.1",
+            "IMAGE": "safebox/nextcloud-nginx:latest",
             "UPDATE": "true",
             "NAME": "nextcloudnginx",
             "ROLES": "backend-www",
diff --git a/nextcloud/template.json b/nextcloud/template.json
index 8eac0f8..cec170c 100644
--- a/nextcloud/template.json
+++ b/nextcloud/template.json
@@ -32,34 +32,34 @@
         {
             "description": "Version",
             "key": "VERSION",
-            "value": "26.0.13-fpm-alpine",
+            "value": "31.0.8-fpm-alpine",
             "info": "Please keep in mind you can't upgrade major version without skipping a version!",
             "advanced": "true"
         },
         {
-            "description": "MYSQL database name",
-            "key": "MARIADB_DATABASE",
+            "description": "Postgres database name",
+            "key": "POSTGRES_DB",
             "value": "",
             "required": "true",
             "generated": "time|md5|8"
         },
         {
-            "description": "MYSQL username",
-            "key": "MARIADB_USER",
+            "description": "Postgres username",
+            "key": "POSTGRES_USER",
             "value": "",
             "required": "true",
             "generated": "time|md5|8"
         },
         {
-            "description": "MYSQL password for user",
-            "key": "MARIADB_PASSWORD",
+            "description": "Postgres password for user",
+            "key": "POSTGRES_PASSWORD",
             "value": "",
             "required": "true",
             "generated": "random|md5|12"
         },
         {
-            "description": "MYSQL root user password",
-            "key": "MARIADB_ROOT_PASSWORD",
+            "description": "Postgres root user password",
+            "key": "POSTGRES_ROOT_PASSWORD",
             "value": "",
             "required": "true",
             "generated": "random|sha256|20"