diff --git a/src/openapi/orders/orders-crud.yaml b/src/openapi/orders/orders-crud.yaml
index 63d3b02..992f6c1 100644
--- a/src/openapi/orders/orders-crud.yaml
+++ b/src/openapi/orders/orders-crud.yaml
@@ -148,7 +148,13 @@ paths:
                               "productCode": "HTM-MND-20",
                               "productDescription": "HTM Maandkorting 20%",
                               "taxAmount": 21,
-                              "taxCodeId": "V21",
+                              "taxMetadata":
+                                {
+                                  "taxMetadataId": "06270769-a263-4325-82d6-f49396f39d03",
+                                  "taxCode": "V21",
+                                  "taxPercentageAmount": 21,
+                                  "description": "21% BTW",
+                                },
                               "amountExclTax": 100,
                               "amountInclTax": 121,
                               "quantity": 1,
@@ -233,7 +239,10 @@ paths:
                                 {
                                   "mandateInputId": "0a875e67-dc9f-4825-a030-d732a2adbfbc",
                                   "directDebitMandateType":
-                                    { "directDebitMandateTypeId": 1, "name": "import" },
+                                    {
+                                      "directDebitMandateTypeId": 1,
+                                      "name": "import",
+                                    },
                                   "createdOn": "2024-03-22T09:00:00",
                                   "bic": "RABONL2U",
                                   "iban": "NL44RABO0123456789",
@@ -254,10 +263,7 @@ paths:
                                 {
                                   "orderCustomerAddressId": "aa50047c-58ac-4f15-9448-ee000dfc6893",
                                   "addressType":
-                                    {
-                                      "addressTypeId": 1,
-                                      "name": "Billing",
-                                    },
+                                    { "addressTypeId": 1, "name": "Billing" },
                                   "street": "Kon. Julianaplein",
                                   "houseNumber": 10,
                                   "houseNumberSuffix": "a",
@@ -305,7 +311,7 @@ paths:
                       "productCode": "HTM-MND-20",
                       "productDescription": "HTM Maandkorting 20%",
                       "taxAmount": 21,
-                      "taxCodeId": "V21",
+                      "taxMetadataId": "7275b910-37d9-40c1-aaac-80d8ceb62ff9",
                       "amountExclTax": 100,
                       "amountInclTax": 121,
                       "quantity": 1,
@@ -459,7 +465,13 @@ paths:
                         "productCode": "HTM-MND-20",
                         "productDescription": "HTM Maandkorting 20%",
                         "taxAmount": 21,
-                        "taxCodeId": "V21",
+                        "taxMetadata":
+                          {
+                            "taxMetadataId": "06270769-a263-4325-82d6-f49396f39d03",
+                            "taxCode": "V21",
+                            "taxPercentageAmount": 21,
+                            "description": "21% BTW",
+                          },
                         "amountExclTax": 100,
                         "amountInclTax": 121,
                         "quantity": 1,
@@ -537,7 +549,10 @@ paths:
                           {
                             "mandateInputId": "0a875e67-dc9f-4825-a030-d732a2adbfbc",
                             "directDebitMandateType":
-                              { "directDebitMandateTypeId": 1, "name": "import" },
+                              {
+                                "directDebitMandateTypeId": 1,
+                                "name": "import",
+                              },
                             "createdOn": "2024-03-22T09:00:00",
                             "bic": "RABONL2U",
                             "iban": "NL44RABO0123456789",
@@ -661,7 +676,7 @@ paths:
                   "productCode": "HTM-MND-20",
                   "productDescription": "HTM Maandkorting 20%",
                   "taxAmount": 21,
-                  "taxCodeId": "V21",
+                  "taxMetadataId": "1d6f1725-1072-4f08-982c-3df51dd854a1",
                   "amountExclTax": 100,
                   "amountInclTax": 121,
                   "quantity": 1,
@@ -859,10 +874,11 @@ paths:
           required: false
           description: The amount of tax calculated.
         - in: query
-          name: taxCodeId
+          name: taxMetadataId
           schema:
-            type: integer
-            example: 1
+            type: string
+            format: uuid
+            example: 3435119f-6a99-4f90-967b-25086b9a8bac
           required: false
           description: The technical id of the tax code.
         - in: query
@@ -976,7 +992,13 @@ paths:
                     "productCode": "HTM-MND-20",
                     "productDescription": "HTM Maandkorting 20%",
                     "taxAmount": 21,
-                    "taxCodeId": "V21",
+                    "taxMetadata":
+                      {
+                        "taxMetadataId": "06270769-a263-4325-82d6-f49396f39d03",
+                        "taxCode": "V21",
+                        "taxPercentageAmount": 21,
+                        "description": "21% BTW",
+                      },
                     "amountExclTax": 100,
                     "amountInclTax": 121,
                     "quantity": 1,
@@ -1046,7 +1068,7 @@ paths:
             example:
               {
                 "taxAmount": 21,
-                "taxCodeId": "V21",
+                "taxMetadataId": "0574440e-7fa0-401f-b907-539c91633a5d",
                 "amountExclTax": 100,
                 "amountInclTax": 121,
                 "quantity": 1,
@@ -1554,7 +1576,8 @@ paths:
                     "mandateInput":
                       {
                         "mandateInputId": "0a875e67-dc9f-4825-a030-d732a2adbfbc",
-                        "directDebitMandateType": { "directDebitMandateTypeId": 1, "name": "import" },
+                        "directDebitMandateType":
+                          { "directDebitMandateTypeId": 1, "name": "import" },
                         "createdOn": "2024-03-22T09:00:00",
                         "bic": "RABONL2U",
                         "iban": "NL44RABO0123456789",
@@ -1717,7 +1740,8 @@ paths:
                     "mandateInputId": "0a875e67-dc9f-4825-a030-d732a2adbfbc",
                     "paymentId": "4a7ee6ec-d218-49b7-a5bf-0107945767ee",
                     "orderId": "afa89108-3e40-44ac-8bea-7c7f0f2d4006",
-                    "directDebitMandateType": { "directDebitMandateTypeId": 1, "name": "import" },
+                    "directDebitMandateType":
+                      { "directDebitMandateTypeId": 1, "name": "import" },
                     "createdOn": "2024-03-22T09:00:00",
                     "bic": "RABONL2U",
                     "iban": "NL44RABO0123456789",
@@ -1911,7 +1935,9 @@ paths:
               schema:
                 $ref: "#/components/schemas/unavailable"
               example:
-                { "orderCustomerAddressId": "9c9ae71f-7de9-49f9-b676-b0fe103f6286" }
+                {
+                  "orderCustomerAddressId": "9c9ae71f-7de9-49f9-b676-b0fe103f6286",
+                }
   /ordercustomeraddresses:
     get:
       summary: Find addresses of a customer on an order.
@@ -1999,8 +2025,7 @@ paths:
                     "orderCustomerAddressId": "aa50047c-58ac-4f15-9448-ee000dfc6893",
                     "orderCustomerId": "540d8b7a-d626-443f-8f99-c24398604d7a",
                     "orderId": "73cca95a-81d1-468f-a8bf-99b36367001a",
-                    "addressType":
-                      { "addressTypeId": 1, "name": "Billing" },
+                    "addressType": { "addressTypeId": 1, "name": "Billing" },
                     "street": "Kon. Julianaplein",
                     "houseNumber": 10,
                     "houseNumberSuffix": "a",
@@ -2047,7 +2072,9 @@ paths:
               schema:
                 $ref: "#/components/schemas/unavailable"
               example:
-                { "orderCustomerAddressId": "d5005529-d4f2-4552-a5b8-477dab7836ec" }
+                {
+                  "orderCustomerAddressId": "d5005529-d4f2-4552-a5b8-477dab7836ec",
+                }
 components:
   securitySchemes:
     bearerToken: