diff --git a/site-ref.pp b/site-ref.pp
index d64212e6..3282d55d 100644
--- a/site-ref.pp
+++ b/site-ref.pp
@@ -33,6 +33,7 @@ import 'roles/monitoring/*.pp'
 import 'roles/network/*.pp'
 import 'roles/object-storage/*.pp'
 import 'roles/orchestration/*.pp'
+import 'roles/spof/*.pp'
 import 'roles/telemetry/*.pp'
 import 'roles/volume/*.pp'
 
diff --git a/site.pp b/site.pp
index a024fee2..37c35ed9 100644
--- a/site.pp
+++ b/site.pp
@@ -63,11 +63,15 @@ node 'os-ci-test13.enovance.com' inherits common {
     class {'os_nosql_node':}
     class {'os_sql_node':}
 
+## Dashboard:
+    class {'os_dashboard':}
+
 ## Telemetry
     class {'os_telemetry_common':}
     class {'os_telemetry_server':}
-    # Enforce using Ceilometer Agent central on one node (should be fixed in Icehouse):
-    class {'ceilometer::agent::central': }
+
+## SPOF services
+    class {'os_spof_node':}
 
 ## Identity
     class {'os_identity_controller':
@@ -92,7 +96,8 @@ node 'os-ci-test13.enovance.com' inherits common {
     class {'os_network_controller': }
 
 # Orchestration
-    class {'os_orchestration_controller': }
+    class {'os_orchestration_common': }
+    class {'os_orchestration_api': }
 
 }
 #
@@ -128,6 +133,10 @@ node 'os-ci-test10.enovance.com', 'os-ci-test11.enovance.com', 'os-ci-test12.eno
 #FIXME 7 is down
 node 'os-ci-test7.enovance.com' inherits common {
 
+## Networking
+  class { 'os_network_common': }
+  class { 'os_network_compute': }
+
 ## Compute
   class { 'os_compute_hypervisor':
     local_ip => $ipaddress_eth0,