diff --git a/Makefile b/Makefile
index 91d7711..f7135bf 100644
--- a/Makefile
+++ b/Makefile
@@ -102,6 +102,9 @@
 prod-containers: docker-base voltha chameleon ofagent netconf shovel dashd vcli grafana consul registrator golang envoyd envoy
 
 containers: docker-base voltha chameleon ofagent podder netconf shovel onos tester config-push dashd vcli portainer grafana nginx consul registrator tools golang envoyd envoy
+prod-containers: docker-base voltha chameleon ofagent netconf shovel dashd vcli grafana consul registrator envoy registry fluentd
+
+containers: docker-base voltha chameleon ofagent podder netconf shovel onos tester config-push dashd vcli portainer grafana nginx consul registrator tools envoy fluentd
 
 docker-base:
 	docker build -t cord/voltha-base -f docker/Dockerfile.base .
@@ -127,6 +130,9 @@
 tools:
 	docker build -t voltha/tools -f docker/Dockerfile.tools .
 
+fluentd:
+	docker build -t cord/fluentd -f docker/Dockerfile.fluentd .
+
 envoy:
 	docker build -t voltha/envoy -f docker/Dockerfile.envoy .