diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index 83bddeb8a1..e4a4ab3e42 100644
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -156,6 +156,7 @@ parameter_defaults:
     * evidence of criminal activity, system personnel may provide    *
     * the evidence from such monitoring to law enforcement officials.*
     ******************************************************************
+  CollectdConnectionType: amqp1
   CollectdExtraPlugins:
     - rrdtool
   CollectdEnableSensubility: true
diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml
index 3b929cc15a..e0bee30147 100644
--- a/ci/environments/scenario001-standalone.yaml
+++ b/ci/environments/scenario001-standalone.yaml
@@ -103,6 +103,7 @@ parameter_defaults:
     * evidence of criminal activity, system personnel may provide    *
     * the evidence from such monitoring to law enforcement officials.*
     ******************************************************************
+  CollectdConnectionType: amqp1
   CollectdExtraPlugins:
     - rrdtool
   CollectdEnableSensubility: true
diff --git a/deployment/metrics/collectd-container-puppet.yaml b/deployment/metrics/collectd-container-puppet.yaml
index a7f5827b42..5d93f564de 100644
--- a/deployment/metrics/collectd-container-puppet.yaml
+++ b/deployment/metrics/collectd-container-puppet.yaml
@@ -65,7 +65,7 @@ parameters:
     default: 'overcloud-collectd'
     type: string
   CollectdConnectionType:
-    default: 'gnocchi'
+    default: 'amqp1'
     description: Define which write plugin should collectd use. Currently
                  supported are 'amqp1', 'network' and 'gnocchi'.
     type: string
diff --git a/environments/metrics/collect-read-rabbitmq.yaml b/environments/metrics/collectd-read-rabbitmq.yaml
similarity index 100%
rename from environments/metrics/collect-read-rabbitmq.yaml
rename to environments/metrics/collectd-read-rabbitmq.yaml
diff --git a/environments/metrics/collectd-standalone.yaml b/environments/metrics/collectd-standalone.yaml
deleted file mode 100644
index 521c8123d3..0000000000
--- a/environments/metrics/collectd-standalone.yaml
+++ /dev/null
@@ -1,142 +0,0 @@
-resource_registry:
-  OS::TripleO::Services::Collectd: ../../deployment/metrics/collectd-container-puppet.yaml
-
-# parameter_defaults:
-#
-################
-#### Basic Collectd configuration
-################
-#
-## These are the default plugins used by collectd
-#
-#   CollectdDefaultPlugins:
-#     - cpu
-#     - df
-#     - disk
-#     - hugepages
-#     - interface
-#     - load
-#     - memory
-#     - processes
-#     - tcpconns
-#     - uptime
-#
-## Extra plugins can be enabled by the CollectdExtraPlugins parameter:
-## All the plugins availables are:
-#
-#   CollectdExtraPlugins:
-#     - amqp1
-#     - apache
-#     - bind
-#     - ceph
-#     - chrony
-#     - connectivity
-#     - conntrack
-#     - contextswitch
-#     - cpufreq
-#     - cpusleep
-#     - curl
-#     - curl_json
-#     - curl_xml
-#     - dns
-#     - fhcount
-#     - filecount
-#     - irq
-#     - ipmi
-#     - mcelog
-#     - mysql
-#     - netlink
-#     - nfs
-#     - ovs_events
-#     - ovs_stats
-#     - ping
-#     - procevent
-#     - protocols
-#     - sensors
-#     - smart
-#     - users
-#     - virt
-#
-## To choose write plugin use below parameter:
-#
-#   CollectdConnectionType: 'gnocchi' (default) / 'amqp1' / 'network'
-#
-################
-#### Collectd with network write plugin
-################
-#
-#   CollectdServer: collectd0.example.com
-#   CollectdServerPort: 25826
-#   CollectdSecurityLevel: None
-#
-## If CollectdSecurityLevel is set to Encrypt or Sign the following parameters
-## are also needed
-#
-#   CollectdUsername: user
-#   CollectdPassword: password
-#
-################
-#### Collectd with gnocchi write plugin
-################
-#
-#   CollectdGnocchiResourceType: collectd
-#   CollectdGnocchiBatchSize: 10
-#   CollectdGnocchiAuthMode: 'basic' / 'keystone' (default)
-#
-## By default collectd with gnocchi write plugin is configured to send metrics
-## to gnocchi instance running on overcloud nodes. You can override this
-## behaviour with below parameters.
-#
-## Parameters for basic authentication
-#   CollectdGnocchiProtocol: 'http'
-#   CollectdGnocchiServer: <IP>
-#   CollectdGnocchiPort: 8041
-#   CollectdGnocchiUser: admin
-#
-## Parameters for Keystone authentication
-#   CollectdGnocchiKeystoneAuthUrl
-#   CollectdGnocchiKeystoneUserName
-#   CollectdGnocchiKeystoneUserId
-#   CollectdGnocchiKeystonePassword
-#   CollectdGnocchiKeystoneProjectId
-#   CollectdGnocchiKeystoneProjectName
-#   CollectdGnocchiKeystoneUserDomainId
-#   CollectdGnocchiKeystoneUserDomainName
-#   CollectdGnocchiKeystoneProjectDomainId
-#   CollectdGnocchiKeystoneProjectDomainName
-#   CollectdGnocchiKeystoneRegionName
-#   CollectdGnocchiKeystoneInterface
-#   CollectdGnocchiKeystoneEndpoint
-#
-################
-#### Collectd with amqp1 write plugin
-################
-#
-## By default collectd uses local edge qdrouterd running on each overcloud node.
-## You can override this behaviour with following parameters.
-#
-#   CollectdAmqpHost: <IP>
-#   CollectdAmqpPort: 5666
-#   CollectdAmqpUser: guest
-#   CollectdAmqpPassword: guest
-#   CollectdAmqpTransportName: metrics
-#   CollectdAmqpAddress: collectd
-#   CollectdAmqpInstances: {}
-#   CollectdAmqpRetryDelay: 1
-#   CollectdAmqpInterval: 30
-#
-################
-#### Tip
-################
-#
-## You can use ExtraConfig (or one of the related *ExtraConfig keys)
-## to additionaly configure collectd. For details see the documentation
-## for puppet-collectd at https://github.com/voxpupuli/puppet-collectd .
-#
-#   ExtraConfig:
-#     collectd::plugin::disk::disks:
-#       - "/^[vhs]d[a-f][0-9]?$/"
-#     collectd::plugin::df::mountpoints:
-#       - "/"
-#     collectd::plugin::df::ignoreselected: false
-#     collectd::plugin::cpu::valuespercentage: true