diff --git a/ci/environments/scenario009-multinode.yaml b/ci/environments/scenario009-multinode.yaml
index 926e42c298..e396f9e5de 100644
--- a/ci/environments/scenario009-multinode.yaml
+++ b/ci/environments/scenario009-multinode.yaml
@@ -1,32 +1,8 @@
 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::SwiftProxy: OS::Heat::None
-  OS::TripleO::Services::SwiftStorage: OS::Heat::None
-  OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
-  OS::TripleO::Services::Keystone: OS::Heat::None
-  OS::TripleO::Services::GlanceApi: OS::Heat::None
-  OS::TripleO::Services::MySQL: OS::Heat::None
-  OS::TripleO::Services::MySQLClient: OS::Heat::None
-  OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None
-  OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
-  OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
-  OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
-  OS::TripleO::Services::NeutronServer: OS::Heat::None
-  OS::TripleO::Services::NeutronCorePlugin: OS::Heat::None
-  OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
-  OS::TripleO::Services::RabbitMQ: OS::Heat::None
-  OS::TripleO::Services::HAproxy: OS::Heat::None
-  OS::TripleO::Services::Keepalived: OS::Heat::None
-  OS::TripleO::Services::Memcached: OS::Heat::None
-  OS::TripleO::Services::NovaConductor: OS::Heat::None
-  OS::TripleO::Services::NovaApi: OS::Heat::None
-  OS::TripleO::Services::NovaPlacement: OS::Heat::None
-  OS::TripleO::Services::NovaMetadata: OS::Heat::None
-  OS::TripleO::Services::NovaScheduler: OS::Heat::None
-  OS::TripleO::Services::NovaCompute: OS::Heat::None
-  OS::TripleO::Services::NovaLibvirt: OS::Heat::None
-
+  OS::TripleO::Services::OpenShift::Master: ../../extraconfig/services/openshift-master.yaml
+  OS::TripleO::Services::OpenShift::Worker: ../../extraconfig/services/openshift-worker.yaml
 
 
 parameter_defaults: