diff --git a/ci/common/ironic_standalone_post.yaml b/ci/common/ironic_standalone_post.yaml
index 49ca30585a..d5849c1f60 100644
--- a/ci/common/ironic_standalone_post.yaml
+++ b/ci/common/ironic_standalone_post.yaml
@@ -3,6 +3,11 @@ heat_template_version: rocky
 parameters:
   servers:
     type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
 
 resources:
   IronicVBMCSetup:
diff --git a/ci/environments/scenario012-standalone.yaml b/ci/environments/scenario012-standalone.yaml
index 74f5253eb4..9f631d7c2d 100644
--- a/ci/environments/scenario012-standalone.yaml
+++ b/ci/environments/scenario012-standalone.yaml
@@ -1,28 +1,20 @@
 resource_registry:
   OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
   OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
-  OS::TripleO::Services::Docker: ../../deployment/deprecated/docker/docker-baremetal-ansible.yaml
   OS::TripleO::Services::NovaIronic: ../../deployment/nova/nova-ironic-container-puppet.yaml
   OS::TripleO::Services::IronicApi: ../../deployment/ironic/ironic-api-container-puppet.yaml
   OS::TripleO::Services::IronicConductor: ../../deployment/ironic/ironic-conductor-container-puppet.yaml
   OS::TripleO::Services::IronicPxe: ../../deployment/ironic/ironic-pxe-container-puppet.yaml
-  # These enable Pacemaker
-  OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
-  OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
-  OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
-  OS::TripleO::Services::Pacemaker: ../../deployment/pacemaker/pacemaker-baremetal-puppet.yaml
-  OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
-  OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml
-  OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   # 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::NodeExtraConfigPost: ../common/ironic_standalone_post.yaml
-  OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml
+  OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-container-puppet.yaml
   OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2Ansible
   OS::TripleO::Services::NeutronDhcpAgent: ../../deployment/neutron/neutron-dhcp-container-puppet.yaml
   OS::TripleO::Services::NovaCompute: OS::Heat::None
   OS::TripleO::Services::NovaLibvirt: OS::Heat::None
+  OS::TripleO::Services::Redis: ../../deployment/database/redis-container-puppet.yaml
 
 parameter_defaults:
   Debug: true