diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json
index babb70f..4be0c8f 100644
--- a/descriptors/ModuleDescriptor-template.json
+++ b/descriptors/ModuleDescriptor-template.json
@@ -52,8 +52,8 @@
       "version": "1.2"
     },
     {
-      "id": "configuration",
-      "version": "2.0"
+      "id": "tenant-addresses",
+      "version": "1.0"
     },
     {
       "id": "locations",
diff --git a/src/main/resources/api_configuration.json b/src/main/resources/api_configuration.json
index 0c01854..db18949 100644
--- a/src/main/resources/api_configuration.json
+++ b/src/main/resources/api_configuration.json
@@ -106,8 +106,7 @@
       "type": "COMMON",
       "method": "GET",
       "pathPattern": "/orders/addresses/billing-and-shipping",
-      "proxyPath": "/settings/entries?offset=:offset&limit=:limit&query=:query",
-      "extraQuery": "scope==ui-tenant-settings.addresses.manage"
+      "proxyPath": "/tenant-addresses?offset=:offset&limit=:limit"
     },
     {
       "type": "COMMON",
diff --git a/src/test/java/org/folio/edge/orders/CommonEndpoint.java b/src/test/java/org/folio/edge/orders/CommonEndpoint.java
index ea6b203..31511b2 100644
--- a/src/test/java/org/folio/edge/orders/CommonEndpoint.java
+++ b/src/test/java/org/folio/edge/orders/CommonEndpoint.java
@@ -10,7 +10,7 @@ public enum CommonEndpoint {
   ACQUISITIONS_UNITS("/orders/acquisitions-units", "/acquisitions-units/units", "acquisitionsUnits", true, true),
   ACQUISITIONS_METHODS("/orders/acquisition-methods", "/orders/acquisition-methods", "acquisitionMethods", true, true),
   ORGANIZATIONS("/organizations", "/organizations/organizations", "organizations", true, true),
-  BILLING_AND_SHIPPING("/orders/addresses/billing-and-shipping", "/settings/entries", "configs", true, false),
+  BILLING_AND_SHIPPING("/orders/addresses/billing-and-shipping", "/tenant-addresses", "addresses", false, true),
   LOCATIONS("/locations-for-order", "/locations", "locations", true, true),
   MATERIAL_TYPES("/material-types-for-order", "/material-types", "mtypes", true, true),
   IDENTIFIER_TYPES("/identifier-types-for-order", "/identifier-types", "identifierTypes", true, true),