diff --git a/deployment/docker/victorialogs/fluentd/Dockerfile b/deployment/docker/victorialogs/fluentd/Dockerfile
index dad82dfbc..340c15249 100644
--- a/deployment/docker/victorialogs/fluentd/Dockerfile
+++ b/deployment/docker/victorialogs/fluentd/Dockerfile
@@ -1,6 +1,8 @@
-FROM fluent/fluentd:v1.17
+FROM fluent/fluentd:v1.17-debian-1
 USER root
 RUN \
+  apt update && \
+  apt install -y netcat-traditional && \
   gem install \
     fluent-plugin-datadog \
     fluent-plugin-grafana-loki \
diff --git a/deployment/docker/victorialogs/fluentd/compose.yml b/deployment/docker/victorialogs/fluentd/compose.yml
index 6a3e33d35..e189f506e 100644
--- a/deployment/docker/victorialogs/fluentd/compose.yml
+++ b/deployment/docker/victorialogs/fluentd/compose.yml
@@ -9,3 +9,22 @@ services:
     depends_on: [victorialogs]
     ports:
       - "5140:5140"
+      - "24224:24224"
+    healthcheck:
+      test: ["CMD", "nc", "-z", "-n", "-v", "127.0.0.1", "24224"]
+      start_period: 3s
+  nginx:
+    image: nginx:1.27
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost"]
+      start_period: 3s
+    ports:
+      - "8080:80"
+    logging:
+      driver: fluentd
+      options:
+        fluentd-address: 127.0.0.1:24224
+        labels: com.docker.compose.service
+    depends_on:
+      fluentd:
+        condition: service_healthy
diff --git a/deployment/docker/victorialogs/fluentd/elasticsearch/fluent.conf b/deployment/docker/victorialogs/fluentd/elasticsearch/fluent.conf
index 145c4d32d..33555c47b 100644
--- a/deployment/docker/victorialogs/fluentd/elasticsearch/fluent.conf
+++ b/deployment/docker/victorialogs/fluentd/elasticsearch/fluent.conf
@@ -1,13 +1,13 @@
 <source>
-  @type tail
-  format none
-  tag docker.testlog
-  path /var/lib/docker/containers/**/*.log
+  @type forward
+  port 24224
+  bind 0.0.0.0
 </source>
 
 <match **>
   @type elasticsearch
   host victorialogs
   path /insert/elasticsearch
+  custom_headers {"VL-Msg-Field": "log", "VL-Stream-Fields": "com.docker.compose.service"}
   port 9428
 </match>
diff --git a/deployment/docker/victorialogs/fluentd/jsonline/fluent.conf b/deployment/docker/victorialogs/fluentd/jsonline/fluent.conf
index cac841e00..c6f5fcfc0 100644
--- a/deployment/docker/victorialogs/fluentd/jsonline/fluent.conf
+++ b/deployment/docker/victorialogs/fluentd/jsonline/fluent.conf
@@ -1,12 +1,11 @@
 <source>
-  @type tail
-  format none
-  tag docker.testlog
-  path /var/lib/docker/containers/**/*.log
+  @type forward
+  port 24224
+  bind 0.0.0.0
 </source>
 
 <match **>
   @type http
   endpoint "http://victorialogs:9428/insert/jsonline"
-  headers {"VL-Msg-Field": "log", "VL-Time-Field": "time", "VL-Stream-Fields": "path"}
+  headers {"VL-Msg-Field": "log", "VL-Stream-Fields": "com.docker.compose.service"}
 </match>
diff --git a/deployment/docker/victorialogs/fluentd/loki/fluent.conf b/deployment/docker/victorialogs/fluentd/loki/fluent.conf
index 460437673..381b962f5 100644
--- a/deployment/docker/victorialogs/fluentd/loki/fluent.conf
+++ b/deployment/docker/victorialogs/fluentd/loki/fluent.conf
@@ -1,10 +1,17 @@
 <source>
-  @type tail
-  format none
-  tag docker.testlog
-  path /var/lib/docker/containers/**/*.log
+  @type forward
+  port 24224
+  bind 0.0.0.0
 </source>
 
+<filter **>
+  @type record_transformer
+  enable_ruby true
+  <record>
+    service ${record['com.docker.compose.service']}
+  </record>
+</filter>
+
 <match **>
   @type loki
   url "http://victorialogs:9428/insert"
@@ -12,6 +19,8 @@
     flush_interval 10s
     flush_at_shutdown true
   </buffer>
-  custom_headers {"VL-Msg-Field": "log", "VL-Time-Field": "time", "VL-Stream-Fields": "path"}
+  <label>
+    service
+  </label>
   buffer_chunk_limit 1m
 </match>