diff --git a/manifests/node/api.pp b/manifests/node/api.pp
index 81ec659..5f77818 100644
--- a/manifests/node/api.pp
+++ b/manifests/node/api.pp
@@ -1,14 +1,10 @@
 class kickstack::node::api inherits kickstack {
   include kickstack::glance::api
-  include kickstack::glance::endpoint
 
   include kickstack::cinder::api
-  include kickstack::cinder::endpoint
 
   include kickstack::quantum::server
-  include kickstack::quantum::endpoint
   include kickstack::quantum::plugin
 
   include kickstack::nova::api
-  include kickstack::nova::endpoint
 }
diff --git a/manifests/node/auth.pp b/manifests/node/auth.pp
index 82060ac..fab1300 100644
--- a/manifests/node/auth.pp
+++ b/manifests/node/auth.pp
@@ -1,4 +1,8 @@
 class kickstack::node::auth inherits kickstack {
   include kickstack::keystone::api
   include kickstack::keystone::endpoint
+  include kickstack::glance::endpoint
+  include kickstack::cinder::endpoint
+  include kickstack::quantum::endpoint
+  include kickstack::nova::endpoint
 }