diff --git a/compose/docker-compose-system-test-dispatcher.yml b/compose/docker-compose-system-test-dispatcher.yml
index 5865d60..8b0fa01 100644
--- a/compose/docker-compose-system-test-dispatcher.yml
+++ b/compose/docker-compose-system-test-dispatcher.yml
@@ -63,7 +63,7 @@
   # Fluentd log server
   #
   fluentd:
-    image: "${REGISTRY}${REPOSITORY}voltha-fluentd${TAG}"
+    image: "${REGISTRY}fluent/fluentd:v0.12.42"
     ports:
     - "24224:24224"
     volumes:
diff --git a/compose/docker-compose-system-test-encrypted.yml b/compose/docker-compose-system-test-encrypted.yml
index 57cd6fa..ca36d7d 100644
--- a/compose/docker-compose-system-test-encrypted.yml
+++ b/compose/docker-compose-system-test-encrypted.yml
@@ -66,7 +66,7 @@
   # Fluentd log server
   #
   fluentd:
-    image: "${REGISTRY}${REPOSITORY}voltha-fluentd${TAG}"
+    image: "${REGISTRY}fluent/fluentd:v0.12.42"
     ports:
     - "24224:24224"
     volumes:
diff --git a/compose/docker-compose-system-test-persistence.yml b/compose/docker-compose-system-test-persistence.yml
index 18cfa43..fc77d9e 100644
--- a/compose/docker-compose-system-test-persistence.yml
+++ b/compose/docker-compose-system-test-persistence.yml
@@ -63,7 +63,7 @@
   # Fluentd log server
   #
   fluentd:
-    image: "${REGISTRY}${REPOSITORY}voltha-fluentd${TAG}"
+    image: "${REGISTRY}fluent/fluentd:v0.12.42"
     ports:
     - "24224:24224"
     volumes:
diff --git a/compose/docker-compose-system-test-with-etcd.yml b/compose/docker-compose-system-test-with-etcd.yml
index a3cc69c..1e591c6 100644
--- a/compose/docker-compose-system-test-with-etcd.yml
+++ b/compose/docker-compose-system-test-with-etcd.yml
@@ -83,7 +83,7 @@
   # Fluentd log server
   #
   fluentd:
-    image: "${REGISTRY}${REPOSITORY}voltha-fluentd${TAG}"
+    image: "${REGISTRY}fluent/fluentd:v0.12.42"
     ports:
     - "24224:24224"
     volumes:
diff --git a/compose/docker-compose-system-test.yml b/compose/docker-compose-system-test.yml
index 99ffcd0..2582fb9 100644
--- a/compose/docker-compose-system-test.yml
+++ b/compose/docker-compose-system-test.yml
@@ -63,7 +63,7 @@
   # Fluentd log server
   #
   fluentd:
-    image: "${REGISTRY}${REPOSITORY}voltha-fluentd${TAG}"
+    image: "${REGISTRY}fluent/fluentd:v0.12.42"
     ports:
     - "24224:24224"
     volumes: