diff --git a/stackrc b/stackrc
index c27ead3c24..0d8f059c1b 100644
--- a/stackrc
+++ b/stackrc
@@ -46,16 +46,18 @@ REGION_NAME=${REGION_NAME:-RegionOne}
 
 # This allows us to pass ``ENABLED_SERVICES``
 if ! isset ENABLED_SERVICES ; then
-    # Compute (Glance / Keystone / Nova (+ nova-network))
-    ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-cond,n-sch,n-novnc,n-xvnc,n-cauth
+    # Keystone - nothing works without keystone
+    ENABLED_SERVICES=key
+    # Nova - services to support libvirt based openstack clouds
+    ENABLED_SERVICES=,n-api,n-cpu,n-net,n-cond,n-sch,n-novnc
+    # Glance services needed for Nova
+    ENABLED_SERVICES=,g-api,g-reg
     # Cinder
     ENABLED_SERVICES+=,c-sch,c-api,c-vol
-    # Heat
-    ENABLED_SERVICES+=,h-eng,h-api,h-api-cfn,h-api-cw
     # Dashboard
     ENABLED_SERVICES+=,horizon
     # Additional services
-    ENABLED_SERVICES+=,rabbit,tempest,mysql
+    ENABLED_SERVICES+=,rabbit,tempest,mysql,dstat
 fi
 
 # SQLAlchemy supports multiple database drivers for each database server