diff --git a/.env b/.env
index bf0c5d4c5..d82dfadd2 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,6 @@
 INFLUXDB_VERSION=1.3.3-alpine
 INFLUXDB_INIT_VERSION=1.0.1
+INFLUXDB_WATCHER_VERSION=0.0.2
 
 MYSQL_VERSION=5.7
 MYSQL_INIT_VERSION=1.5.4
@@ -7,6 +8,7 @@ MYSQL_INIT_VERSION=1.5.4
 MEMCACHED_VERSION=1.5.0-alpine
 CADVISOR_VERSION=v0.27.1
 ZOOKEEPER_VERSION=3.4
+ZOOKEEPER_WATCHER_VERSION=0.0.2
 
 MON_SIDECAR_VERSION=1.0.0
 MON_KEYSTONE_VERSION=1.1.3
diff --git a/ci.py b/ci.py
index f1d62aa69..7260704e1 100644
--- a/ci.py
+++ b/ci.py
@@ -42,9 +42,12 @@
 METRIC_PIPELINE_MODULE_TO_COMPOSE_SERVICES = {
     'monasca-agent-forwarder': 'agent-forwarder',
     'zookeeper': 'zookeeper',
+    'zookeeper-watcher': 'zookeeper-watcher',
     'influxdb': 'influxdb',
+    'influxdb-watcher': 'influxdb-watcher',
     'kafka': 'kafka',
     'kafka-init': 'kafka-init',
+    'kafka-watcher': 'kafka-watcher',
     'monasca-thresh': 'thresh',
     'monasca-persister-python': 'monasca-persister',
     'mysql-init': 'mysql-init',
diff --git a/docker-compose.yml b/docker-compose.yml
index 67cafba44..4090a61be 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,6 +16,16 @@ services:
       LOGSTASH_FIELDS: "service=influxdb-init"
     depends_on:
       - influxdb
+  influxdb-watcher:
+    image: monasca/influxdb-watcher:${INFLUXDB_WATCHER_VERSION}
+    environment:
+      INFLUXDB_ADDRESS: "http://influxdb:8086"
+      PROMETHEUS_ENDPOINT: "0.0.0.0:8080"
+      LOGSTASH_FIELDS: "service=influxdb-watcher"
+    depends_on:
+      - influxdb
+    ports:
+      - "18081:8080"
 
   # cadvisor will allow host metrics to be collected, but requires significant
   # access to the host system
@@ -61,6 +71,16 @@ services:
     environment:
       LOGSTASH_FIELDS: "service=zookeeper"
     restart: on-failure
+  zookeeper-watcher:
+    image: monasca/zookeeper-watcher:${ZOOKEEPER_WATCHER_VERSION}
+    environment:
+      ZOOKEEPER_SERVERS: "zookeeper"
+      PROMETHEUS_ENDPOINT: "0.0.0.0:8080"
+      LOGSTASH_FIELDS: "service=zookeeper-watcher"
+    depends_on:
+      - zookeeper
+    ports:
+      - "18082:8080"
 
   kafka:
     image: monasca/kafka:${MON_KAFKA_VERSION}