diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml
index aaf1286e..5c2ec94f 100644
--- a/docker/freshrss/docker-compose.yml
+++ b/docker/freshrss/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     restart: unless-stopped
     networks:
       - freshrss
-      - mariadb
+      - postgres
       - proxy
     ports:
       - 8088:80
@@ -36,7 +36,7 @@ services:
 networks:
   freshrss:
     external: false
-  mariadb:
+  postgres:
     external: true
   proxy:
     external: true
diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml
index 4fafc49e..b633d3e7 100644
--- a/docker/gitea/docker-compose.yaml
+++ b/docker/gitea/docker-compose.yaml
@@ -8,14 +8,9 @@ services:
       - TZ=Europe/Helsinki
       - USER_UID=1000
       - USER_GID=1000
-      - DB_TYPE=mysql
-      - DB_HOST=mariadb:3306
-      - DB_NAME=gitea
-      - DB_USER=gitea
-      - DB_PASSWD=${MYSQL_PASS}
     restart: unless-stopped
     networks:
-      - mariadb
+      - postgres
       - proxy
     ports:
       - "3000:3000"
@@ -40,7 +35,7 @@ services:
       - "traefik.http.services.gitea.loadbalancer.server.port=3000"
 
 networks:
-  mariadb:
+  postgres:
     external: true
   proxy:
     external: true
diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml
index d339b160..ebcf1206 100644
--- a/docker/homeautomation/docker-compose.yml
+++ b/docker/homeautomation/docker-compose.yml
@@ -13,7 +13,7 @@ services:
     restart: unless-stopped
     networks:
       - homeautomation
-      - mariadb
+      - postgres
       - proxy
     ports:
       - "8123:8123"
@@ -133,11 +133,11 @@ services:
     volumes:
       - /docker/homeautomation/gotify:/app/data
     environment:
-      - GOTIFY_DATABASE_DIALECT=mysql
-      - GOTIFY_DATABASE_CONNECTION=gotify:gotify@tcp(mariadb:3306)/gotify?charset=utf8&parseTime=True&loc=Local
+      - GOTIFY_DATABASE_DIALECT=postgres
+      - GOTIFY_DATABASE_CONNECTION="host=postgres port=5432 user=gotify dbname=gotify password=${GOTIFY_PGPASS} sslmode=disable"
     networks:
       - proxy
-      - mariadb
+      - postgres
     restart: unless-stopped
     labels:
       - "traefik.enable=true"
@@ -158,7 +158,7 @@ services:
 networks:
   homeautomation:
     external: false
-  mariadb:
+  postgres:
     external: true
   proxy:
     external: true
diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml
index e424267e..50275831 100644
--- a/docker/nextcloud/docker-compose.yml
+++ b/docker/nextcloud/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - "1869:80"
     networks:
       - nextcloud
-      - mariadb
+      - postgres
       - proxy
     volumes:
       - /docker/nextcloud:/var/www/html
@@ -19,7 +19,6 @@ services:
       - /etc/localtime:/etc/localtime:ro
     environment:
       - TZ=Europe/Helsinki
-      - MYSQL_HOST=mariadb-nextcloud
       - REDIS_HOST=redis
       - REDIS_HOST_PASSWORD=123
     depends_on:
@@ -61,7 +60,7 @@ services:
 networks:
   nextcloud:
     external: false
-  mariadb:
+  postgres:
     external: true
   proxy:
     external: true
diff --git a/docker/postgres/docker-compose.yaml b/docker/postgres/docker-compose.yaml
new file mode 100644
index 00000000..92942046
--- /dev/null
+++ b/docker/postgres/docker-compose.yaml
@@ -0,0 +1,20 @@
+version: "3"
+services:
+  postgres:
+    container_name: postgres
+    image: postgres:13
+    environment:
+      - TZ=Europe/Helsinki
+      - POSTGRES_PASSWORD=12345
+    ports:
+      - 5432:5432
+    networks:
+      - postgres
+    volumes:
+      - /docker/postgres:/var/lib/postgresql/data
+      - /etc/localtime:/etc/localtime:ro
+    restart: unless-stopped
+
+networks:
+  postgres:
+    external: true