diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index 0317ce7..13bf725 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -33,13 +33,15 @@ services:
       - "traefik.http.routers.gitea.rule=Host(`${CN}`)"
 
   db:
-    image: postgres:13.5
+    image: postgres:13.11-alpine
     env_file: ./secrets/db.secrets
     restart: unless-stopped
-    command: ["postgres", "-c", "log_statement=all", "-c", "logging_collector=on"]
     volumes:
       - ${DATA_PATH}/db/data:/var/lib/postgresql/data
       - ${DATA_PATH}/db/.pgpass:/root/.pgpass
+    labels:
+      - "co.elastic.logs/module=postgresql"
+      - "co.elastic.logs/fileset=log"
 
 networks:
   proxy:
diff --git a/matrix/docker-compose.yml b/matrix/docker-compose.yml
index 68906c2..d2a36dc 100644
--- a/matrix/docker-compose.yml
+++ b/matrix/docker-compose.yml
@@ -43,6 +43,9 @@ services:
     volumes:
       - ${DATA_PATH}/db/data:/var/lib/postgresql/data
       - ${DATA_PATH}/db/.pgpass:/root/.pgpass
+    labels:
+      - "co.elastic.logs/module=postgresql"
+      - "co.elastic.logs/fileset=log"
 
 networks:
   proxy:
diff --git a/mattermost/docker-compose.yml b/mattermost/docker-compose.yml
index d18490d..bba5a27 100644
--- a/mattermost/docker-compose.yml
+++ b/mattermost/docker-compose.yml
@@ -2,13 +2,16 @@ version: "3.8"
 
 services:
   db:
-    image: postgres:12.9-alpine
+    image: postgres:12.15-alpine
     restart: unless-stopped
     volumes:
       - ${DATA_PATH}/db/var/lib/postgresql/data:/var/lib/postgresql/data
       - ${DATA_PATH}/db/.pgpass:/root/.pgpass
       - /etc/localtime:/etc/localtime:ro
     env_file: secrets/db.secrets
+    labels:
+      - "co.elastic.logs/module=postgresql"
+      - "co.elastic.logs/fileset=log"
 
   app:
     image: mm_app:7.9.1