diff --git a/src/openapi/products/productreference-crud.yaml b/src/openapi/products/productreference-crud.yaml
index 15e6224..9897b43 100644
--- a/src/openapi/products/productreference-crud.yaml
+++ b/src/openapi/products/productreference-crud.yaml
@@ -1568,6 +1568,10 @@ paths:
                   customerDataItem: ovPayToken
                 - mandatoryCustomerDataItemId: 8
                   customerDataItem: padBirthDate
+                - mandatoryCustomerDataItemId: 9
+                  customerDataItem: shippingAddress
+                - mandatoryCustomerDataItemId: 10
+                  customerDataItem: billingAddress
               schema:
                 $ref: '#/components/schemas/mandatoryCustomerDataItems'
           description: A list of users
diff --git a/src/openapi/products/products-crud.yaml b/src/openapi/products/products-crud.yaml
index 1d64415..493e49e 100644
--- a/src/openapi/products/products-crud.yaml
+++ b/src/openapi/products/products-crud.yaml
@@ -483,16 +483,18 @@ paths:
                         "sellingPrices": [
                           {
                             "amountExclTax": 92,
-                            "taxMetadataId": "501B17EF-36C4-4039-B92C-6517969B464E",
                             "amountInclTax": 100,
+                            "taxCode": "V09",
+                            "taxPercentage": 9.0000,
                             "fromInclusive": "2024-09-01T00:00:00.000",
                             "toInclusive": "2024-12-31T23:59:59.999",
                             "internalPrice": 92.0000
                           },
                           {
                             "amountExclTax": 101,
-                            "taxMetadataId": "501B17EF-36C4-4039-B92C-6517969B464E",
                             "amountInclTax": 110,
+                            "taxCode": "V09",
+                            "taxPercentage": 9.0000,
                             "fromInclusive": "2025-01-01T00:00:00.000",
                             "toInclusive": "2025-12-31T23:59:59.999",
                             "internalPrice": 101.0000
@@ -506,16 +508,18 @@ paths:
                         "sellingPrices": [
                           {
                             "amountExclTax": 92,
-                            "taxMetadataId": "501B17EF-36C4-4039-B92C-6517969B464E",
                             "amountInclTax": 100,
+                            "taxCode": "V09",
+                            "taxPercentage": 9.0000,
                             "fromInclusive": "2024-09-01T00:00:00.000",
                             "toInclusive": "2024-12-31T23:59:59.999",
                             "internalPrice": 92.0000
                           },
                           {
                             "amountExclTax": 101,
-                            "taxMetadataId": "501B17EF-36C4-4039-B92C-6517969B464E",
                             "amountInclTax": 110,
+                            "taxCode": "V09",
+                            "taxPercentage": 9.0000,
                             "fromInclusive": "2025-01-01T00:00:00.000",
                             "toInclusive": "2025-12-31T23:59:59.999",
                             "internalPrice": 101.0000
@@ -526,8 +530,9 @@ paths:
                     "purchasePrices": [
                       {
                         "amountExclTax": 0,
-                        "taxMetadataId": "501B17EF-36C4-4039-B92C-6517969B464F",
                         "amountInclTax": 0,
+                        "taxCode": "V09",
+                        "taxPercentage": 9.0000,
                         "fromInclusive": "2024-09-01T00:00:00.000",
                         "toInclusive": "2025-12-31T23:59:59.999"
                       }
@@ -622,8 +627,9 @@ paths:
                         "sellingPrices": [
                           {
                             "amountExclTax": 5413,
-                            "taxMetadataId": "501B17EF-36C4-4039-B92C-6517969B464E",
                             "amountInclTax": 5900,
+                            "taxCode": "V09",
+                            "taxPercentage": 9.0000,
                             "fromInclusive": "2024-09-01T00:00:00.000",
                             "toInclusive": "2024-12-31T23:59:59.999",
                             "internalPrice": 5413.0000
@@ -634,8 +640,9 @@ paths:
                     "purchasePrices": [
                       {
                         "amountExclTax": 0,
-                        "taxMetadataId": "501B17EF-36C4-4039-B92C-6517969B464F",
                         "amountInclTax": 0,
+                        "taxCode": "V09",
+                        "taxPercentage": 9.0000,
                         "fromInclusive": "2024-09-01T00:00:00.000",
                         "toInclusive": "2024-12-31T23:59:59.999"
                       }