diff --git a/keystone/client/service/radosgw-swift.yml b/keystone/client/service/radosgw-swift.yml
index 6a0f0e5..e93f9b4 100644
--- a/keystone/client/service/radosgw-swift.yml
+++ b/keystone/client/service/radosgw-swift.yml
@@ -25,12 +25,12 @@
                   public_address: ${_param:cluster_public_host}
                   public_protocol: ${_param:cluster_public_protocol}
                   public_port: ${_param:radosgw_swift_cluster_port}
-                  public_path: '/swift/v1' # /$(project_id)s
+                  public_path: '/swift/v1/AUTH_%(tenant_id)s'
                   internal_address: ${_param:radosgw_service_host}
                   internal_port: ${_param:radosgw_swift_cluster_port}
-                  internal_path: '/swift/v1'
+                  internal_path: '/swift/v1/AUTH_%(tenant_id)s'
                   internal_protocol: ${_param:radosgw_service_protocol}
                   admin_protocol: ${_param:radosgw_service_protocol}
                   admin_address: ${_param:radosgw_service_host}
                   admin_port: ${_param:radosgw_swift_cluster_port}
-                  admin_path: '/swift/v1'
+                  admin_path: '/swift/v1/AUTH_%(tenant_id)s'
diff --git a/keystone/client/v3/service/radosgw-swift.yml b/keystone/client/v3/service/radosgw-swift.yml
index 692c200..ca06fed 100644
--- a/keystone/client/v3/service/radosgw-swift.yml
+++ b/keystone/client/v3/service/radosgw-swift.yml
@@ -22,13 +22,13 @@
               endpoints:
                 radosgw-swift_public:
                   interface: 'public'
-                  url: ${_param:cluster_public_protocol}://${_param:cluster_public_host}:${_param:radosgw_swift_cluster_port}/swift/v1
+                  url: ${_param:cluster_public_protocol}://${_param:cluster_public_host}:${_param:radosgw_swift_cluster_port}/swift/v1/AUTH_%(tenant_id)s
                   region: ${_param:openstack_region}
                 radosgw-swift_internal:
                   interface: 'internal'
-                  url: ${_param:radosgw_service_protocol}://${_param:radosgw_service_host}:${_param:radosgw_swift_cluster_port}/swift/v1
+                  url: ${_param:radosgw_service_protocol}://${_param:radosgw_service_host}:${_param:radosgw_swift_cluster_port}/swift/v1/AUTH_%(tenant_id)s
                   region: ${_param:openstack_region}
                 radosgw-swift_admin:
                   interface: 'admin'
-                  url: ${_param:radosgw_service_protocol}://${_param:radosgw_service_host}:${_param:radosgw_swift_cluster_port}/swift/v1
+                  url: ${_param:radosgw_service_protocol}://${_param:radosgw_service_host}:${_param:radosgw_swift_cluster_port}/swift/v1/AUTH_%(tenant_id)s
                   region: ${_param:openstack_region}