diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml
index b4b8d8f9e4..11f6b8b7fb 100644
--- a/ci/environments/scenario001-standalone.yaml
+++ b/ci/environments/scenario001-standalone.yaml
@@ -1,10 +1,24 @@
 resource_registry:
+  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::CeilometerAgentCentral: ../../docker/services/ceilometer-agent-central.yaml
+  OS::TripleO::Services::CeilometerAgentNotification: ../../docker/services/ceilometer-agent-notification.yaml
+  OS::TripleO::Services::ComputeCeilometerAgent: ../../docker/services/ceilometer-agent-compute.yaml
   OS::TripleO::Services::CephMgr: ../../docker/services/ceph-ansible/ceph-mgr.yaml
   OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
   OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
   OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
   OS::TripleO::Services::PankoApi: ../../docker/services/panko-api.yaml
   OS::TripleO::Services::Collectd: ../../docker/services/metrics/collectd.yaml
+  OS::TripleO::Services::GnocchiApi: ../../docker/services/gnocchi-api.yaml
+  OS::TripleO::Services::GnocchiMetricd: ../../docker/services/gnocchi-metricd.yaml
+  OS::TripleO::Services::GnocchiStatsd: ../../docker/services/gnocchi-statsd.yaml
+  OS::TripleO::Services::HeatApi: ../../docker/services/heat-api.yaml
+  OS::TripleO::Services::HeatApiCfn: ../../docker/services/heat-api-cfn.yaml
+  OS::TripleO::Services::HeatApiCloudwatch: ../../puppet/services/disabled/heat-api-cloudwatch-disabled.yaml
+  OS::TripleO::Services::HeatEngine: ../../docker/services/heat-engine.yaml
   OS::TripleO::Services::MetricsQdr: ../../docker/services/metrics/qdr.yaml
   OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/pacemaker/rpc-rabbitmq.yaml
   OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.yaml
@@ -26,6 +40,10 @@ resource_registry:
   # Some infra instances don't pass the ping test but are otherwise working.
   # Since the OVB jobs also test this functionality we can shut it off here.
   OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
+  OS::TripleO::Services::SwiftProxy: OS::Heat::None
+  OS::TripleO::Services::SwiftStorage: OS::Heat::None
+  OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
+  OS::TripleO::Services::Horizon: OS::Heat::None
 
 parameter_defaults:
   StandaloneExtraConfig:
@@ -36,6 +54,13 @@ parameter_defaults:
     # in sync with the archive policy, 60s too.
     ceilometer::agent::polling::polling_interval: 15
   ManagePolling: true
+  ManagePipeline: true
+  PipelinePublishers:
+    - gnocchi://?archive_policy=ceilometer-high-rate
+  EventPipelinePublishers:
+    - gnocchi://?archive_policy=ceilometer-high-rate
+    - panko://
+
 
   Debug: true
   # fetch dir needed for standalone
@@ -68,7 +93,7 @@ parameter_defaults:
   GlanceBackend: rbd
   GnocchiBackend: rbd
   CinderEnableIscsiBackend: false
-  GnocchiArchivePolicy: 'high'
+  GnocchiArchivePolicy: 'ceilometer-high-rate'
   BannerText: |
     ******************************************************************
     * This system is for the use of authorized users only. Usage of  *