diff --git a/etc/skyline.yaml.sample b/etc/skyline.yaml.sample
index 26c529d..ee47059 100644
--- a/etc/skyline.yaml.sample
+++ b/etc/skyline.yaml.sample
@@ -76,6 +76,7 @@ openstack:
     image: glance
     load-balancer: octavia
     network: neutron
+    object-store: swift
     orchestration: heat
     placement: placement
     volumev3: cinder
diff --git a/libs/skyline-apiserver/skyline_apiserver/config/openstack.py b/libs/skyline-apiserver/skyline_apiserver/config/openstack.py
index eeb16a5..3e4bf57 100644
--- a/libs/skyline-apiserver/skyline_apiserver/config/openstack.py
+++ b/libs/skyline-apiserver/skyline_apiserver/config/openstack.py
@@ -174,6 +174,7 @@ service_mapping = Opt(
         "placement": "placement",
         "baremetal": "ironic",
         "load-balancer": "octavia",
+        "object-store": "swift",
     },
 )
 
diff --git a/libs/skyline-nginx/skyline_nginx/cmd/generate_nginx.py b/libs/skyline-nginx/skyline_nginx/cmd/generate_nginx.py
index 94d9e8a..de09824 100644
--- a/libs/skyline-nginx/skyline_nginx/cmd/generate_nginx.py
+++ b/libs/skyline-nginx/skyline_nginx/cmd/generate_nginx.py
@@ -91,7 +91,12 @@ def get_proxy_endpoints() -> Dict[str, ProxyEndpoint]:
         if raw_url.path:
             raw_path = PurePath(raw_url.path)
             if len(raw_path.parts) > 1:
-                if raw_path.match("%(tenant_id)s") or raw_path.match("$(project_id)s"):
+                if (
+                    raw_path.match("%(tenant_id)s")
+                    or raw_path.match("AUTH_%(tenant_id)s")
+                    or raw_path.match("$(project_id)s")
+                    or raw_path.match("AUTH_$(project_id)s")
+                ):
                     path = "" if str(raw_path.parents[1]) == "/" else raw_path.parents[1]
                 elif raw_path.match("v[0-9]") or raw_path.match("v[0-9][.][0-9]"):
                     path = "" if str(raw_path.parents[0]) == "/" else raw_path.parents[0]