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