diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index e4a4ab3e42..571f8f8e31 100644
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -103,6 +103,7 @@ parameter_defaults:
     ceilometer::agent::polling::polling_interval: 15
   ManagePolling: true
   ManagePipeline: true
+  CeilometerEnableGnocchi: true
   PipelinePublishers:
     - gnocchi://?archive_policy=ceilometer-high-rate
   EventPipelinePublishers:
diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml
index d3206fa095..b42153476b 100644
--- a/ci/environments/scenario001-standalone.yaml
+++ b/ci/environments/scenario001-standalone.yaml
@@ -47,6 +47,7 @@ parameter_defaults:
   ManagePolling: true
   HeatConfigureDelegatedRoles: true
   ManagePipeline: true
+  CeilometerEnableGnocchi: true
   PipelinePublishers:
     - gnocchi://?archive_policy=ceilometer-high-rate
   EventPipelinePublishers:
diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml
index 8b82291b7c..0f4a3872f6 100644
--- a/ci/environments/scenario002-multinode-containers.yaml
+++ b/ci/environments/scenario002-multinode-containers.yaml
@@ -94,6 +94,7 @@ parameter_defaults:
     ceilometer::agent::polling::polling_interval: 15
   ManagePolling: true
   ManagePipeline: true
+  CeilometerEnableGnocchi: true
   PipelinePublishers:
     - gnocchi://?archive_policy=ceilometer-high-rate
   EventPipelinePublishers:
diff --git a/ci/environments/scenario002-standalone.yaml b/ci/environments/scenario002-standalone.yaml
index 4e973ee031..337a74972c 100644
--- a/ci/environments/scenario002-standalone.yaml
+++ b/ci/environments/scenario002-standalone.yaml
@@ -36,6 +36,7 @@ parameter_defaults:
     ceilometer::agent::polling::polling_interval: 15
   ManagePolling: true
   ManagePipeline: true
+  CeilometerEnableGnocchi: true
   PipelinePublishers:
     - gnocchi://?archive_policy=ceilometer-high-rate
   EventPipelinePublishers:
diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml
index afaf14b6c7..f375594e82 100644
--- a/ci/environments/scenario004-multinode-containers.yaml
+++ b/ci/environments/scenario004-multinode-containers.yaml
@@ -123,6 +123,7 @@ parameter_defaults:
   NovaEnableRbdBackend: true
   CinderEnableRbdBackend: true
   CinderBackupBackend: ceph
+  CeilometerEnableGnocchi: true
   GlanceBackend: rbd
   GnocchiBackend: rbd
   CinderEnableIscsiBackend: false
diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml
index 755c93f464..77947af5a2 100644
--- a/ci/environments/scenario004-standalone.yaml
+++ b/ci/environments/scenario004-standalone.yaml
@@ -71,6 +71,7 @@ parameter_defaults:
   ManilaCephFSMetadataPoolPGNum: 16
   NovaEnableRbdBackend: true
   GlanceBackend: rbd
+  CeilometerEnableGnocchi: true
   GnocchiBackend: rbd
   GnocchiArchivePolicy: 'high'
   BannerText: |
diff --git a/ci/environments/scenario010-multinode-containers.yaml b/ci/environments/scenario010-multinode-containers.yaml
index e1f7291d4b..e848c1b8ca 100644
--- a/ci/environments/scenario010-multinode-containers.yaml
+++ b/ci/environments/scenario010-multinode-containers.yaml
@@ -112,6 +112,7 @@ parameter_defaults:
   CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
   CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
   NovaEnableRbdBackend: true
+  CeilometerEnableGnocchi: true
   GlanceBackend: rbd
   GnocchiRbdPoolName: metrics
   SwiftCeilometerPipelineEnabled: false
diff --git a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
index 52aa9111c0..a542d935a0 100644
--- a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
@@ -48,6 +48,13 @@ parameters:
   MonitoringSubscriptionCeilometerCentral:
     default: 'overcloud-ceilometer-agent-central'
     type: string
+  CeilometerEnableGnocchi:
+    default: false
+    description: Whether to enable gnocchi usage.
+    type: boolean
+
+conditions:
+    ceilometer_enable_gnocchi: {equals: [{get_param: CeilometerEnableGnocchi}, True]}
 
 resources:
 
@@ -124,25 +131,29 @@ outputs:
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
         step_5:
-          ceilometer_gnocchi_upgrade:
-            start_order: 99
-            image: *ceilometer_agent_central_image
-            net: host
-            detach: false
-            privileged: false
-            user: root
-            healthcheck:
-              test: /openstack/healthcheck
-            volumes:
-              list_concat:
-                - {get_attr: [ContainersCommon, volumes]}
-                -
-                  - /var/lib/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
-                  - /var/log/containers/ceilometer:/var/log/ceilometer:z
-            command:
-              - '/usr/bin/bootstrap_host_exec'
-              - 'ceilometer_agent_central'
-              - "su ceilometer -s /bin/bash -c 'for n in {1..10}; do /usr/bin/ceilometer-upgrade && exit 0 || sleep 30; done; exit 1'"
+          map_merge:
+            - if:
+              - ceilometer_enable_gnocchi
+              - ceilometer_gnocchi_upgrade:
+                  start_order: 99
+                  image: *ceilometer_agent_central_image
+                  net: host
+                  detach: false
+                  privileged: false
+                  user: root
+                  healthcheck:
+                    test: /openstack/healthcheck
+                  volumes:
+                    list_concat:
+                      - {get_attr: [ContainersCommon, volumes]}
+                      -
+                        - /var/lib/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
+                        - /var/log/containers/ceilometer:/var/log/ceilometer:z
+                  command:
+                    - '/usr/bin/bootstrap_host_exec'
+                    - 'ceilometer_agent_central'
+                    - "su ceilometer -s /bin/bash -c 'for n in {1..10}; do /usr/bin/ceilometer-upgrade && exit 0 || sleep 30; done; exit 1'"
+              - {}
       host_prep_tasks:
         - name: create persistent directories
           file:
diff --git a/deployment/ceilometer/ceilometer-base-container-puppet.yaml b/deployment/ceilometer/ceilometer-base-container-puppet.yaml
index da34027bbd..e065408516 100644
--- a/deployment/ceilometer/ceilometer-base-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-base-container-puppet.yaml
@@ -57,7 +57,7 @@ parameters:
     description: Whether to manage event_pipeline.yaml.
     type: boolean
   EventPipelinePublishers:
-    default: ['gnocchi://?filter_project=service&archive_policy=low']
+    default: []
     description: >
         A list of publishers to put in event_pipeline.yaml. When the
         collector is used, override this with notifier:// publisher.
@@ -70,7 +70,7 @@ parameters:
     description: Whether to manage pipeline.yaml.
     type: boolean
   PipelinePublishers:
-    default: ['gnocchi://?filter_project=service&archive_policy=low']
+    default: []
     description: >
         A list of publishers to put in pipeline.yaml. When the
         collector is used, override this with notifier:// publisher.
diff --git a/deployment/deprecated/telemetry/enable-legacy-telemetry.yaml b/deployment/deprecated/telemetry/enable-legacy-telemetry.yaml
new file mode 100644
index 0000000000..e773991a6b
--- /dev/null
+++ b/deployment/deprecated/telemetry/enable-legacy-telemetry.yaml
@@ -0,0 +1,26 @@
+# This heat environment can be used to enable legacy telemetry services,
+# gnocchi and aodh.
+
+resource_registry:
+  OS::TripleO::Services::GnocchiApi: ../deployment/gnocchi/gnocchi-api-container-puppet.yaml
+  OS::TripleO::Services::GnocchiMetricd: ../deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
+  OS::TripleO::Services::GnocchiStatsd: ../deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
+  OS::TripleO::Services::AodhApi: ../deployment/aodh/aodh-api-container-puppet.yaml
+  OS::TripleO::Services::AodhEvaluator: ../deployment/aodh/aodh-evaluator-container-puppet.yaml
+  OS::TripleO::Services::AodhNotifier: ../deployment/aodh/aodh-notifier-container-puppet.yaml
+  OS::TripleO::Services::AodhListener: ../deployment/aodh/aodh-listener-container-puppet.yaml
+  OS::TripleO::Services::Redis: ../deployment/database/redis-pacemaker-puppet.yaml
+  OS::TripleO::Services::CeilometerAgentCentral: ../deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
+  OS::TripleO::Services::CeilometerAgentNotification: ../deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
+  OS::TripleO::Services::ComputeCeilometerAgent: ../deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
+
+parameter_defaults:
+  GnocchiRbdPoolName: 'metrics'
+  GnocchiBackend: 'rbd'
+  GnocchiArchivePolicy: 'high'
+  CeilometerEnableGnocchi: true
+  ManagePipeline: true
+  EventPipelinePublishers:
+    - gnocchi://?archive_policy=high
+  PipelinePublishers:
+    - gnocchi://?archive_policy=high
diff --git a/environments/ceph-ansible/ceph-ansible-external.yaml b/environments/ceph-ansible/ceph-ansible-external.yaml
index a73ecb7fad..d9f20475a2 100644
--- a/environments/ceph-ansible/ceph-ansible-external.yaml
+++ b/environments/ceph-ansible/ceph-ansible-external.yaml
@@ -12,7 +12,8 @@ parameter_defaults:
   CinderEnableRbdBackend: true
   CinderBackupBackend: ceph
   GlanceBackend: rbd
-  GnocchiBackend: rbd
+  # Uncomment below if enabling legacy telemetry
+  # GnocchiBackend: rbd
   # If the Ceph pools which host VMs, Volumes and Images do not match these
   # names OR the client keyring to use is not named 'openstack',  edit the
   # following as needed.
@@ -20,7 +21,8 @@ parameter_defaults:
   CinderRbdPoolName: volumes
   CinderBackupRbdPoolName: backups
   GlanceRbdPoolName: images
-  GnocchiRbdPoolName: metrics
+  # Uncomment below if enabling legacy telemetry
+  # GnocchiRbdPoolName: metrics
   CephClientUserName: openstack
 
   # finally we disable the Cinder LVM backend
diff --git a/environments/ceph-ansible/ceph-ansible-per-role.yaml b/environments/ceph-ansible/ceph-ansible-per-role.yaml
index 2d81a10c2e..8e111f1b96 100644
--- a/environments/ceph-ansible/ceph-ansible-per-role.yaml
+++ b/environments/ceph-ansible/ceph-ansible-per-role.yaml
@@ -13,6 +13,7 @@ parameter_defaults:
   CinderEnableRbdBackend: true
   CinderBackupBackend: ceph
   GlanceBackend: rbd
-  GnocchiBackend: rbd
+  ## Uncomment below if enabling legacy telemetry
+  # GnocchiBackend: rbd
   GlanceShowMultipleLocations: true
   # NovaEnableRbdBackend can be set on individual roles to choose RBD or local ephemeral storage
diff --git a/environments/ceph-ansible/ceph-ansible.yaml b/environments/ceph-ansible/ceph-ansible.yaml
index a53c2a41c6..1880b84d49 100644
--- a/environments/ceph-ansible/ceph-ansible.yaml
+++ b/environments/ceph-ansible/ceph-ansible.yaml
@@ -14,4 +14,5 @@ parameter_defaults:
   CinderBackupBackend: ceph
   NovaEnableRbdBackend: true
   GlanceBackend: rbd
-  GnocchiBackend: rbd
+  ## Uncomment below if enabling legacy telemetry
+  # GnocchiBackend: rbd
diff --git a/environments/computealt.yaml b/environments/computealt.yaml
index 50428af589..4b73020ba0 100644
--- a/environments/computealt.yaml
+++ b/environments/computealt.yaml
@@ -1,8 +1,9 @@
 resource_registry:
   OS::TripleO::Services::CollectdAlt: OS::Heat::None
-  # If enabling collectd you'll need provide the following in a specific resource_registry
+  # If enabling collectd you'll need to provide the following in a specific resource_registry
   # OS::TripleO::Services::CollectdAlt: ../deployment/metrics/collectd-container-puppet.yaml
-  OS::TripleO::Services::ComputeCeilometerAgentAlt: ../deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
+  # If enabling legacy telemetry, you'll need to provide the following in a specific resource_registry
+  # OS::TripleO::Services::ComputeCeilometerAgentAlt: ../deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
   OS::TripleO::Services::ComputeNeutronOvsAgentAlt: ../deployment/neutron/neutron-ovs-agent-container-puppet.yaml
   OS::TripleO::Services::IscsidAlt: ../deployment/iscsid/iscsid-container-puppet.yaml
   OS::TripleO::Services::NovaComputeAlt: ../deployment/nova/nova-compute-container-puppet.yaml
diff --git a/environments/disable-telemetry.yaml b/environments/disable-telemetry.yaml
index 0654640210..05398cab50 100644
--- a/environments/disable-telemetry.yaml
+++ b/environments/disable-telemetry.yaml
@@ -14,6 +14,7 @@ resource_registry:
   OS::TripleO::Services::AodhEvaluator: OS::Heat::None
   OS::TripleO::Services::AodhNotifier: OS::Heat::None
   OS::TripleO::Services::AodhListener: OS::Heat::None
+  OS::TripleO::Services::Redis: OS::Heat::None
 
 parameter_defaults:
   NotificationDriver: 'noop'
diff --git a/environments/services-baremetal/undercloud-ceilometer.yaml b/environments/services-baremetal/undercloud-ceilometer.yaml
index 41944f713a..4c03852ee4 100644
--- a/environments/services-baremetal/undercloud-ceilometer.yaml
+++ b/environments/services-baremetal/undercloud-ceilometer.yaml
@@ -1,4 +1,5 @@
 resource_registry:
+  OS::TripleO::Services::Redis: ../../deployment/database/redis-pacemaker-puppet.yaml
   OS::TripleO::Services::UndercloudCeilometerAgentCentral: ../../deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
   OS::TripleO::Services::UndercloudCeilometerAgentNotification: ../../deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
   OS::TripleO::Services::UndercloudCeilometerAgentIpmi: ../../deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
diff --git a/environments/services-baremetal/undercloud-gnocchi.yaml b/environments/services-baremetal/undercloud-gnocchi.yaml
index df46b5ca2b..2f0dc5526b 100644
--- a/environments/services-baremetal/undercloud-gnocchi.yaml
+++ b/environments/services-baremetal/undercloud-gnocchi.yaml
@@ -1,5 +1,5 @@
 resource_registry:
-  OS::TripleO::Services::UndercloudGnocchiApi: ../../deployment/gnocchi/gnocchi-api-container-puppet.yaml
-  OS::TripleO::Services::UndercloudGnocchiMetricd: ../../deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
-  OS::TripleO::Services::UndercloudGnocchiStatsd: ../../deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
+  OS::TripleO::Services::UndercloudGnocchiApi: OS::Heat::None
+  OS::TripleO::Services::UndercloudGnocchiMetricd: OS::Heat::None
+  OS::TripleO::Services::UndercloudGnocchiStatsd: OS::Heat::None
   OS::TripleO::Services::UndercloudRedis: ../../deployment/database/redis-container-puppet.yaml
diff --git a/environments/storage-environment-external.yaml b/environments/storage-environment-external.yaml
index 3bf6f674d9..328e961525 100644
--- a/environments/storage-environment-external.yaml
+++ b/environments/storage-environment-external.yaml
@@ -20,7 +20,8 @@ parameter_defaults:
   CinderEnableRbdBackend: true
   CinderBackupBackend: ceph
   GlanceBackend: rbd
-  GnocchiBackend: rbd
+  ## Uncomment below if enabling legacy telemetry
+  # GnocchiBackend: rbd
   # If the Ceph pools which host VMs, Volumes and Images do not match these
   # names OR the client keyring to use is not named 'openstack',  edit the
   # following as needed.
@@ -28,8 +29,9 @@ parameter_defaults:
   CinderRbdPoolName: volumes
   CinderBackupRbdPoolName: backups
   GlanceRbdPoolName: images
-  GnocchiRbdPoolName: metrics
   CephClientUserName: openstack
+  ## Uncomment below if enabling legacy telemetry
+  # GnocchiRbdPoolName: metrics
 
   # finally we disable the Cinder LVM backend
   CinderEnableIscsiBackend: false
diff --git a/environments/storage-environment.yaml b/environments/storage-environment.yaml
index 9ffb890ecb..eb5439e3a0 100644
--- a/environments/storage-environment.yaml
+++ b/environments/storage-environment.yaml
@@ -27,7 +27,8 @@ parameter_defaults:
   ## Glance backend can be either 'rbd' (Ceph), 'swift' or 'file'.
   GlanceBackend: rbd
   ## Gnocchi backend can be either 'rbd' (Ceph), 'swift' or 'file'.
-  GnocchiBackend: rbd
+  ## Uncomment below if enabling legacy telemetry
+  # GnocchiBackend: rbd
 
 
   #### CINDER NFS SETTINGS ####
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index c819160990..7eae8632d7 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -191,7 +191,7 @@ resource_registry:
   # TODO(aschultz): Remove this in U as we switched to a task in the deploy
   OS::TripleO::Services::SELinux: OS::Heat::None
   OS::TripleO::Services::Sshd: deployment/sshd/sshd-baremetal-puppet.yaml
-  OS::TripleO::Services::Redis: deployment/database/redis-container-puppet.yaml
+  OS::TripleO::Services::Redis: OS::Heat::None
   OS::TripleO::Services::NovaApi: deployment/nova/nova-api-container-puppet.yaml
   OS::TripleO::Services::NovaCompute: deployment/nova/nova-compute-container-puppet.yaml
   OS::TripleO::Services::NovaConductor: deployment/nova/nova-conductor-container-puppet.yaml
@@ -217,15 +217,15 @@ resource_registry:
   OS::TripleO::Services::SwiftRingBuilder: deployment/swift/swift-ringbuilder-container-puppet.yaml
   OS::TripleO::Services::Snmp: deployment/snmp/snmp-baremetal-puppet.yaml
   OS::TripleO::Services::Timezone: deployment/time/timezone-baremetal-ansible.yaml
-  OS::TripleO::Services::CeilometerAgentCentral: deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
-  OS::TripleO::Services::CeilometerAgentIpmi: deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
-  OS::TripleO::Services::CeilometerAgentNotification: deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
-  OS::TripleO::Services::ComputeCeilometerAgent: deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
+  OS::TripleO::Services::CeilometerAgentCentral: OS::Heat::None
+  OS::TripleO::Services::CeilometerAgentIpmi: OS::Heat::None
+  OS::TripleO::Services::CeilometerAgentNotification: OS::Heat::None
+  OS::TripleO::Services::ComputeCeilometerAgent: OS::Heat::None
   OS::TripleO::Services::Horizon: deployment/horizon/horizon-container-puppet.yaml
   #Gnocchi services
-  OS::TripleO::Services::GnocchiApi: deployment/gnocchi/gnocchi-api-container-puppet.yaml
-  OS::TripleO::Services::GnocchiMetricd: deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
-  OS::TripleO::Services::GnocchiStatsd: deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
+  OS::TripleO::Services::GnocchiApi: OS::Heat::None
+  OS::TripleO::Services::GnocchiMetricd: OS::Heat::None
+  OS::TripleO::Services::GnocchiStatsd: OS::Heat::None
   # Drop Xinetd
   OS::TripleO::Services::Xinetd: OS::Heat::None
 
@@ -259,10 +259,10 @@ resource_registry:
   OS::TripleO::Services::BarbicanBackendDogtag: OS::Heat::None
   OS::TripleO::Services::BarbicanBackendKmip: OS::Heat::None
   OS::TripleO::Services::BarbicanBackendPkcs11Crypto: OS::Heat::None
-  OS::TripleO::Services::AodhApi: deployment/aodh/aodh-api-container-puppet.yaml
-  OS::TripleO::Services::AodhEvaluator: deployment/aodh/aodh-evaluator-container-puppet.yaml
-  OS::TripleO::Services::AodhListener: deployment/aodh/aodh-listener-container-puppet.yaml
-  OS::TripleO::Services::AodhNotifier: deployment/aodh/aodh-notifier-container-puppet.yaml
+  OS::TripleO::Services::AodhApi: OS::Heat::None
+  OS::TripleO::Services::AodhEvaluator: OS::Heat::None
+  OS::TripleO::Services::AodhListener: OS::Heat::None
+  OS::TripleO::Services::AodhNotifier: OS::Heat::None
   OS::TripleO::Services::MetricsQdr: OS::Heat::None
   OS::TripleO::Services::MistralEngine: OS::Heat::None
   OS::TripleO::Services::MistralApi: OS::Heat::None