diff --git a/spid_cie_oidc/entity/views.py b/spid_cie_oidc/entity/views.py
index 2aa3a844..0d454973 100644
--- a/spid_cie_oidc/entity/views.py
+++ b/spid_cie_oidc/entity/views.py
@@ -145,7 +145,7 @@ def openid_jwks(request, metadata_type:str, resource_type:str):
         resource_tytpe = set(jwks_uri, jwks.jose)
     """
     _sub = request.build_absolute_uri().rsplit(resource_type)[0]
-    _lookup = _sub.replace(f"{metadata_type}/", "")
+    _lookup = _sub.replace(f"/{metadata_type}/", "")
     conf = FederationEntityConfiguration.objects.filter(
         # TODO: check for reverse proxy and forwarders ...
         sub=_lookup,
diff --git a/spid_cie_oidc/provider/views/connect.py b/spid_cie_oidc/provider/views/connect.py
index 74d0607a..f484f7a4 100644
--- a/spid_cie_oidc/provider/views/connect.py
+++ b/spid_cie_oidc/provider/views/connect.py
@@ -18,7 +18,7 @@ def openid_configuration(request):
     OIDC Discovery configuration at
     .well-known/openid-configuration
     """
-    _sub = request.build_absolute_uri().split(".well-known/openid-configuration")[0]
+    _sub = request.build_absolute_uri().split("/.well-known/openid-configuration")[0]
     conf = FederationEntityConfiguration.objects.filter(
         # TODO: check for reverse proxy and forwarders ...
         sub=_sub,