diff --git a/environments/metrics/collect-read-rabbitmq.yaml b/environments/metrics/collect-read-rabbitmq.yaml
new file mode 100644
index 0000000000..eca017808f
--- /dev/null
+++ b/environments/metrics/collect-read-rabbitmq.yaml
@@ -0,0 +1,15 @@
+
+# This environment file serves for enabling python-collect-rabbitmq and configuring
+# it to monitor overcloud RabbitMQ instance
+
+parameter_defaults:
+  ControllerExtraConfig:
+    tripleo::profile::base::metrics::collectd::python_read_plugins:
+      - python-collectd-rabbitmq
+    collectd::plugin::python::modules:
+      collectd_rabbitmq_monitoring:
+        config:
+          - host: "%{hiera('rabbitmq::interface')}"
+            port: "%{hiera('rabbitmq::port')}"
+            username: "%{hiera('rabbitmq::default_user')}"
+            password: "%{hiera('rabbitmq::default_pass')}"
diff --git a/environments/collectd-environment.yaml b/environments/metrics/collectd-standalone.yaml
similarity index 100%
rename from environments/collectd-environment.yaml
rename to environments/metrics/collectd-standalone.yaml
diff --git a/environments/metrics/collectd-write-qdr.yaml b/environments/metrics/collectd-write-qdr.yaml
new file mode 100644
index 0000000000..308a8d62b2
--- /dev/null
+++ b/environments/metrics/collectd-write-qdr.yaml
@@ -0,0 +1,28 @@
+## This environment servers the purpose of enabling collectd to send metrics
+## through mesh of QPID dispatch routers. Each overcloud node will have one local
+## qdrouterd service running and collectd will send data to it.
+
+
+resource_registry:
+  OS::TripleO::Services::Collectd: ../../docker/services/metrics/collectd.yaml
+  OS::TripleO::Services::MetricsQdr: ../../docker/services/metrics/qdr.yaml
+
+
+parameter_defaults:
+  CeilometerQdrPublish: true
+  CollectdConnectionType: amqp1
+  CollectdAmqpInstances:
+    notify:
+      notify: true
+      format: JSON
+      presettle: true
+    telemetry:
+      format: JSON
+      presettle: false
+  #MetricsQdrConnectors:
+  #  - host: IP1
+  #    port: 1234
+  #    role: inter-router
+  #  - host: IP2
+  #    port: 5678
+  #    role: inter-router