diff --git a/2.x/docker-compose/segmented/core/docker-compose.yaml b/2.x/docker-compose/segmented/core/docker-compose.yaml
index 8b21841..2042795 100644
--- a/2.x/docker-compose/segmented/core/docker-compose.yaml
+++ b/2.x/docker-compose/segmented/core/docker-compose.yaml
@@ -1,5 +1,9 @@
 services:
   core:
+    logging:
+      driver: journald
+      options:
+        tag: "defguard-core"
     image: ghcr.io/defguard/defguard:2
     environment:    
       DEFGUARD_DB_HOST: db
@@ -16,6 +20,10 @@ services:
       - "8000:8000"
 
   db:
+    logging:
+      driver: journald
+      options:
+        tag: "defguard-db"
     image: postgres:18-alpine
     environment:
       # Make sure to change these credentials in production!
diff --git a/2.x/docker-compose/segmented/edge/docker-compose.yaml b/2.x/docker-compose/segmented/edge/docker-compose.yaml
index c261287..3e52fb5 100644
--- a/2.x/docker-compose/segmented/edge/docker-compose.yaml
+++ b/2.x/docker-compose/segmented/edge/docker-compose.yaml
@@ -1,5 +1,9 @@
 services:
   edge:
+    logging:
+      driver: journald
+      options:
+        tag: "defguard-edge"
     image: ghcr.io/defguard/defguard-proxy:2
     restart: unless-stopped
     container_name: "defguard-proxy"
diff --git a/2.x/docker-compose/segmented/gateway/docker-compose.yaml b/2.x/docker-compose/segmented/gateway/docker-compose.yaml
index 5e31f8a..cc80242 100644
--- a/2.x/docker-compose/segmented/gateway/docker-compose.yaml
+++ b/2.x/docker-compose/segmented/gateway/docker-compose.yaml
@@ -1,5 +1,9 @@
 services:
   gateway:
+    logging:
+      driver: journald
+      options:
+        tag: "defguard-gateway"
     image: ghcr.io/defguard/gateway:2
     restart: unless-stopped
     container_name: "defguard-gateway"
diff --git a/docker-compose2.0/docker-compose.setup.yaml b/docker-compose2.0/docker-compose.setup.yaml
index 85a418d..a5478bf 100644
--- a/docker-compose2.0/docker-compose.setup.yaml
+++ b/docker-compose2.0/docker-compose.setup.yaml
@@ -1,6 +1,10 @@
 services:
   core:
     restart: unless-stopped
+    logging:
+      driver: journald
+      options:
+        tag: "defguard-core"
     image: ghcr.io/defguard/defguard:${DEFGUARD_CORE_TAG:?DEFGUARD_CORE_TAG is required}
     env_file: .env
     environment:
@@ -17,6 +21,10 @@ services:
 
   edge:
     restart: unless-stopped
+    logging:
+      driver: journald
+      options:
+        tag: "defguard-edge"
     image: ghcr.io/defguard/defguard-proxy:${DEFGUARD_PROXY_TAG:?DEFGUARD_PROXY_TAG is required}
     env_file: .env
     volumes:
@@ -28,6 +36,10 @@ services:
 
   gateway:
     restart: unless-stopped
+    logging:
+      driver: journald
+      options:
+        tag: "defguard-gateway"
     image: ghcr.io/defguard/gateway:${DEFGUARD_GATEWAY_TAG:?DEFGUARD_GATEWAY_TAG is required}
     env_file: .env
     cap_add:
@@ -42,6 +54,10 @@ services:
 
   db:
     restart: unless-stopped
+    logging:
+      driver: journald
+      options:
+        tag: "defguard-db"
     image: postgres:18-alpine
     env_file: .env
     volumes:
diff --git a/docker-compose2.0/docker-compose.yaml b/docker-compose2.0/docker-compose.yaml
index c2344e5..b7c88ea 100644
--- a/docker-compose2.0/docker-compose.yaml
+++ b/docker-compose2.0/docker-compose.yaml
@@ -1,5 +1,9 @@
 services:
   core:
+    logging:
+      driver: journald
+      options:
+        tag: "defguard-core"
     image: ghcr.io/defguard/defguard:2
     environment:
       DEFGUARD_COOKIE_INSECURE: "true"
@@ -18,6 +22,10 @@ services:
       - "8000:8000"
 
   edge1:
+    logging:
+      driver: journald
+      options:
+        tag: "defguard-edge1"
     image: ghcr.io/defguard/defguard-proxy:2
     volumes:
       - ./.volumes/certs2.0/edge1:/etc/defguard/certs
@@ -27,6 +35,10 @@ services:
       - "443:443"
 
   gateway1:
+    logging:
+      driver: journald
+      options:
+        tag: "defguard-gateway1"
     image: ghcr.io/defguard/gateway:2
     cap_add:
       - NET_ADMIN
@@ -39,6 +51,10 @@ services:
       HEALTH_PORT: 55003
 
   db:
+    logging:
+      driver: journald
+      options:
+        tag: "defguard-db"
     image: postgres:18-alpine
     environment:
       POSTGRES_DB: defguard
diff --git a/ova/files/docker-compose.template.yaml b/ova/files/docker-compose.template.yaml
index 052e442..70443c6 100644
--- a/ova/files/docker-compose.template.yaml
+++ b/ova/files/docker-compose.template.yaml
@@ -2,6 +2,10 @@ services:
   core:
     restart: unless-stopped
     profiles: [core]
+    logging:
+      driver: journald
+      options:
+        tag: "defguard-core"
     image: ghcr.io/defguard/defguard:__DEFGUARD_CORE_TAG__
     env_file: .env
     environment:
@@ -19,6 +23,10 @@ services:
   edge:
     restart: unless-stopped
     profiles: [edge]
+    logging:
+      driver: journald
+      options:
+        tag: "defguard-edge"
     image: ghcr.io/defguard/defguard-proxy:__DEFGUARD_PROXY_TAG__
     volumes:
       - ./.volumes/certs/edge:/etc/defguard/certs
@@ -33,6 +41,10 @@ services:
   gateway:
     restart: unless-stopped
     profiles: [gateway]
+    logging:
+      driver: journald
+      options:
+        tag: "defguard-gateway"
     image: ghcr.io/defguard/gateway:__DEFGUARD_GATEWAY_TAG__
     cap_add:
       - NET_ADMIN
@@ -47,6 +59,10 @@ services:
     image: louislam/dockge:1
     restart: unless-stopped
     profiles: [dockge]
+    logging:
+      driver: journald
+      options:
+        tag: "defguard-dockge"
     ports:
       - "5001:5001"
     volumes:
@@ -59,6 +75,10 @@ services:
   db:
     restart: unless-stopped
     profiles: [core]
+    logging:
+      driver: journald
+      options:
+        tag: "defguard-db"
     image: postgres:18-alpine
     env_file: .env
     volumes: