diff --git a/src/openapi/fiko/fiko-crud.yaml b/src/openapi/fiko/fiko-crud.yaml
index eb3146c..74a019d 100644
--- a/src/openapi/fiko/fiko-crud.yaml
+++ b/src/openapi/fiko/fiko-crud.yaml
@@ -506,9 +506,7 @@ paths:
               schema:
                 $ref: "#/components/schemas/unavailable"
               example:
-                {
-                  "productMetadataId": "39a87c2a-9011-4dfd-b35e-1245a98c2e61",
-                }
+                { "productMetadataId": "39a87c2a-9011-4dfd-b35e-1245a98c2e61" }
   /contraAccountMetadata:
     get:
       summary: Get contra account metadata.
@@ -530,7 +528,7 @@ paths:
             example: 220.10419
           description: The contra account.
         - in: query
-          name: validFrom
+          name: validAt
           schema:
             type: string
             format: date-time
@@ -557,7 +555,7 @@ paths:
                     "contraAccount": "220.10419",
                     "validFrom": "2024-03-22T09:00:00",
                     "validUntil": null,
-                  }
+                  },
                 ]
     post:
       summary: Add contra account metadata.
@@ -625,7 +623,145 @@ paths:
                 {
                   "contraAccountMetadataId": "37a8095b-19db-498f-9349-5f37d21c5bdf",
                 }
-#  /taxMetadata:
+  /taxMetadata:
+    get:
+      summary: Get tax metadata.
+      description: Get tax metadata.
+      tags:
+        - Metadata v2
+      parameters:
+        - in: query
+          name: taxMetadataId
+          schema:
+            type: string
+            format: uuid
+            example: 37a8095b-19db-498f-9349-5f37d21c5bdf
+          description: The id of the tax metadata.
+        - in: query
+          name: taxCode
+          schema:
+            type: string
+            example: V21
+          description: The tax code.
+        - in: query
+          name: taxPercentageAmount
+          schema:
+            type: string
+            example: 21
+          description: The tax percentage amount.
+        - in: query
+          name: description
+          schema:
+            type: string
+            example: BTW VERKOOP HOOG 21%
+          description: The description of the tax metadata.
+        - in: query
+          name: validAt
+          schema:
+            type: string
+            format: date-time
+            example: 2024-03-22T09:00:00
+          description: Date that the tax metadata is valid.
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/unavailable"
+              example:
+                [
+                  {
+                    "taxMetadataId": "bc4ea24a-27a5-40e8-bbbc-57a105afaaa0",
+                    "taxCode": "V21",
+                    "taxPercentageAmount": 21,
+                    "description": "BTW VERKOOP HOOG 21%",
+                    "validFrom": "2024-01-01T00:00:00.000",
+                    "validUntil": null,
+                  },
+                  {
+                    "taxMetadataId": "73c47af3-7c8b-44d3-b599-9b6f5a587a82",
+                    "taxCode": "V09",
+                    "taxPercentageAmount": 9,
+                    "description": "BTW VERKOOP LAAG 9%",
+                    "validFrom": "2024-01-01T00:00:00.000",
+                    "validUntil": null,
+                  },
+                  {
+                    "taxMetadataId": "423b879c-e8db-4ba2-a2b4-0adfe037043d",
+                    "taxCode": "V0",
+                    "taxPercentageAmount": 0,
+                    "description": "BTW VERKOOP NUL",
+                    "validFrom": "2024-01-01T00:00:00.000",
+                    "validUntil": null,
+                  },
+                ]
+    post:
+      summary: Add tax metadata.
+      description: Add tax metadata.
+      tags:
+        - Metadata v2
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/unavailable"
+            example:
+              {
+                "taxCode": "V21",
+                "taxPercentageAmount": 21,
+                "description": "BTW VERKOOP HOOG 21%",
+                "validFrom": "2024-03-22T09:00:00",
+                "validUntil": null,
+              }
+      responses:
+        "201":
+          description: Created
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/unavailable"
+              example:
+                { "taxMetadataId": "37a8095b-19db-498f-9349-5f37d21c5bdf" }
+  /taxMetadata/{taxMetadataId}:
+    parameters:
+      - in: path
+        name: taxMetadataId
+        schema:
+          type: string
+          format: uuid
+          example: 37a8095b-19db-498f-9349-5f37d21c5bdf
+        required: true
+        description: The id of the tax metadata.
+    patch:
+      summary: Update tax metadata.
+      description: Update tax metadata.
+      tags:
+        - Metadata v2
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/unavailable"
+            example:
+              {
+                "taxCode": "V21",
+                "taxPercentageAmount": 21,
+                "description": "BTW VERKOOP HOOG 21%",
+                "validFrom": "2024-03-22T09:00:00",
+                "validUntil": "2025-12-31T23:59:59",
+              }
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/unavailable"
+              example:
+                { "taxMetadataId": "37a8095b-19db-498f-9349-5f37d21c5bdf" }
 components:
   securitySchemes:
     bearerToken: