diff --git a/recipes/server.rb b/recipes/server.rb
index fddc213..73f4484 100644
--- a/recipes/server.rb
+++ b/recipes/server.rb
@@ -86,6 +86,10 @@ end
 
 identity_admin_endpoint = endpoint "identity-admin"
 identity_endpoint = endpoint "identity-api"
+compute_endpoint = endpoint "compute-api"
+ec2_endpoint = endpoint "compute-ec2-api"
+image_endpoint = endpoint "image-api"
+volume_endpoint = endpoint "volume-api"
 
 admin_tenant_name = node["keystone"]["admin_tenant_name"]
 admin_user = node["keystone"]["admin_user"]
@@ -124,14 +128,22 @@ template "/etc/keystone/keystone.conf" do
   notifies :restart, "service[keystone]", :immediately
 end
 
-endpoints = endpoints
+uris = {
+  'identity-admin': identity_admin_endpoint.to_s,
+  'identity': identity_endpoint.to_s,
+  'image': image_endpoint.to_s,
+  'compute': compute_endpoint.to_s,
+  'ec2': ec2_endpoint.to_s,
+  'volume': volume_endpoint.to_s
+}
+
 template "/etc/keystone/default_catalog.templates" do
   source "default_catalog.templates.erb"
   owner node["keystone"]["user"]
   group node["keystone"]["group"]
   mode   00644
   variables(
-    "endpoints" => endpoints
+    "uris" => uris
   )
 
   notifies :restart, "service[keystone]", :immediately
diff --git a/templates/default/default_catalog.templates.erb b/templates/default/default_catalog.templates.erb
index c227338..730f91e 100644
--- a/templates/default/default_catalog.templates.erb
+++ b/templates/default/default_catalog.templates.erb
@@ -1,24 +1,24 @@
-catalog.<%= node['keystone']['region'] %>.identity.publicURL = <%= @endpoints['identity'].to_s %>
-catalog.<%= node['keystone']['region'] %>.identity.adminURL = <%= @endpoints['identity'].to_s %>
-catalog.<%= node['keystone']['region'] %>.identity.internalURL = <%= @endpoints['identity'].to_s %>
+catalog.<%= node['keystone']['region'] %>.identity.publicURL = <%= @uris['identity'].to_s %>
+catalog.<%= node['keystone']['region'] %>.identity.adminURL = <%= @uris['identity'].to_s %>
+catalog.<%= node['keystone']['region'] %>.identity.internalURL = <%= @uris['identity-admin'].to_s %>
 catalog.<%= node['keystone']['region'] %>.identity.name = Identity Service
 
-catalog.<%= node['keystone']['region'] %>.compute.publicURL = <%= @endpoints['compute'].to_s %>
-catalog.<%= node['keystone']['region'] %>.compute.adminURL = <%= @endpoints['compute'].to_s %>
-catalog.<%= node['keystone']['region'] %>.compute.internalURL = <%= @endpoints['compute'].to_s %>
+catalog.<%= node['keystone']['region'] %>.compute.publicURL = <%= @uris['compute'].to_s %>
+catalog.<%= node['keystone']['region'] %>.compute.adminURL = <%= @uris['compute'].to_s %>
+catalog.<%= node['keystone']['region'] %>.compute.internalURL = <%= @uris['compute'].to_s %>
 catalog.<%= node['keystone']['region'] %>.compute.name = Compute Service
 
-catalog.<%= node['keystone']['region'] %>.volume.publicURL = <%= @endpoints['volume'].to_s %>
-catalog.<%= node['keystone']['region'] %>.volume.adminURL = <%= @endpoints['volume'].to_s %>
-catalog.<%= node['keystone']['region'] %>.volume.internalURL = <%= @endpoints['volume'].to_s %>
+catalog.<%= node['keystone']['region'] %>.volume.publicURL = <%= @uris['volume'].to_s %>
+catalog.<%= node['keystone']['region'] %>.volume.adminURL = <%= @uris['volume'].to_s %>
+catalog.<%= node['keystone']['region'] %>.volume.internalURL = <%= @uris['volume'].to_s %>
 catalog.<%= node['keystone']['region'] %>.volume.name = Volume Service
 
-catalog.<%= node['keystone']['region'] %>.ec2.publicURL = <%= @endpoints['ec2'].to_s %>
-catalog.<%= node['keystone']['region'] %>.ec2.adminURL = <%= @endpoints['ec2'].to_s %>
-catalog.<%= node['keystone']['region'] %>.ec2.internalURL = <%= @endpoints['ec2'].to_s %>
+catalog.<%= node['keystone']['region'] %>.ec2.publicURL = <%= @uris['ec2'].to_s %>
+catalog.<%= node['keystone']['region'] %>.ec2.adminURL = <%= @uris['ec2'].to_s %>
+catalog.<%= node['keystone']['region'] %>.ec2.internalURL = <%= @uris['ec2'].to_s %>
 catalog.<%= node['keystone']['region'] %>.ec2.name = EC2 Service
 
-catalog.<%= node['keystone']['region'] %>.image.publicURL = <%= @endpoints['image'].to_s %>
-catalog.<%= node['keystone']['region'] %>.image.adminURL = <%= @endpoints['image'].to_s %>
-catalog.<%= node['keystone']['region'] %>.image.internalURL = <%= @endpoints['image'].to_s %>
+catalog.<%= node['keystone']['region'] %>.image.publicURL = <%= @uris['image'].to_s %>
+catalog.<%= node['keystone']['region'] %>.image.adminURL = <%= @uris['image'].to_s %>
+catalog.<%= node['keystone']['region'] %>.image.internalURL = <%= @uris['image'].to_s %>
 catalog.<%= node['keystone']['region'] %>.image.name = Image Service