diff --git a/etc/default_catalog.templates b/etc/default_catalog.templates
index e885b52e66..77ab07e027 100644
--- a/etc/default_catalog.templates
+++ b/etc/default_catalog.templates
@@ -1,42 +1,32 @@
 # config for templated.Catalog, using camelCase because I don't want to do
 # translations for keystone compat
-catalog.RegionOne.identity.publicURL = http://localhost:$(public_port)s/v2.0
-catalog.RegionOne.identity.adminURL = http://localhost:$(admin_port)s/v2.0
-catalog.RegionOne.identity.internalURL = http://localhost:$(public_port)s/v2.0
+catalog.RegionOne.identity.publicURL = http://localhost:$(public_port)s/v3
+catalog.RegionOne.identity.adminURL = http://localhost:$(admin_port)s/v3
+catalog.RegionOne.identity.internalURL = http://localhost:$(public_port)s/v3
 catalog.RegionOne.identity.name = Identity Service
 
 # fake compute service for now to help novaclient tests work
-catalog.RegionOne.computev21.publicURL = http://localhost:8774/v2.1/$(tenant_id)s
-catalog.RegionOne.computev21.adminURL = http://localhost:8774/v2.1/$(tenant_id)s
-catalog.RegionOne.computev21.internalURL = http://localhost:8774/v2.1/$(tenant_id)s
+catalog.RegionOne.computev21.publicURL = http://localhost:8774/v2.1
+catalog.RegionOne.computev21.adminURL = http://localhost:8774/v2.1
+catalog.RegionOne.computev21.internalURL = http://localhost:8774/v2.1
 catalog.RegionOne.computev21.name = Compute Service V2.1
 
-catalog.RegionOne.volumev2.publicURL = http://localhost:8776/v2/$(tenant_id)s
-catalog.RegionOne.volumev2.adminURL = http://localhost:8776/v2/$(tenant_id)s
-catalog.RegionOne.volumev2.internalURL = http://localhost:8776/v2/$(tenant_id)s
-catalog.RegionOne.volumev2.name = Volume Service V2
-
-catalog.RegionOne.ec2.publicURL = http://localhost:8773/services/Cloud
-catalog.RegionOne.ec2.adminURL = http://localhost:8773/services/Admin
-catalog.RegionOne.ec2.internalURL = http://localhost:8773/services/Cloud
-catalog.RegionOne.ec2.name = EC2 Service
-
-catalog.RegionOne.image.publicURL = http://localhost:9292
-catalog.RegionOne.image.adminURL = http://localhost:9292
-catalog.RegionOne.image.internalURL = http://localhost:9292
-catalog.RegionOne.image.name = Image Service
+catalog.RegionOne.volumev3.publicURL = http://localhost:8776/v3
+catalog.RegionOne.volumev3.adminURL = http://localhost:8776/v3
+catalog.RegionOne.volumev3.internalURL = http://localhost:8776/v3
+catalog.RegionOne.volumev3.name = Volume Service V3
 
 catalog.RegionOne.network.publicURL = http://localhost:9696
 catalog.RegionOne.network.adminURL = http://localhost:9696
 catalog.RegionOne.network.internalURL = http://localhost:9696
 catalog.RegionOne.network.name = Network Service
 
+catalog.RegionOne.placement.publicURL = http://localhost:8778
+catalog.RegionOne.placement.adminURL = http://localhost:8778
+catalog.RegionOne.placement.internalURL = http://localhost:8778
+catalog.RegionOne.placement.name = Placement Service
+
 catalog.RegionOne.orchestration.publicURL = http://localhost:8004/v1/$(tenant_id)s
 catalog.RegionOne.orchestration.adminURL = http://localhost:8004/v1/$(tenant_id)s
 catalog.RegionOne.orchestration.internalURL = http://localhost:8004/v1/$(tenant_id)s
 catalog.RegionOne.orchestration.name = Orchestration Service
-
-catalog.RegionOne.metering.publicURL = http://localhost:8777
-catalog.RegionOne.metering.adminURL = http://localhost:8777
-catalog.RegionOne.metering.internalURL = http://localhost:8777
-catalog.RegionOne.metering.name = Telemetry Service