diff --git a/src/endpoints/SOL002SOL003_endpoints.yaml b/src/endpoints/SOL002SOL003_endpoints.yaml
index 9826af8da2227785a6487091c963b5876d7f9066..977eb5a1a1d0539b4fa7add01eee3745dad16029 100644
--- a/src/endpoints/SOL002SOL003_endpoints.yaml
+++ b/src/endpoints/SOL002SOL003_endpoints.yaml
@@ -3,12 +3,7 @@
 endpoints:
   api-versions:
     parameters:
-      - name: Version
-        description: >
-          Version of the API requested to use when responding to this request.
-        in: header
-        required: false
-        type: string
+      - $ref: ../components/SOL002SOL003_params.yaml#/components/parameters/Version
     get:
       summary: Retrieve API version information
       description: >
@@ -16,39 +11,60 @@ endpoints:
         table 4.6.3.3.3.2-1 for request and response data structures, and response codes. URI query parameters are not
         supported.
       responses:
-        200:
-          description: >
-            200 OK
-            
-            API version information was read successfully.
-            The response body shall contain 4.4 API version
-            information, as defined in clause 4.4.1.13.
+        "200":
+          $ref: '#/components/responses/ApiVersions.Get'
+        "400":
+          $ref: ../responses/SOL002SOL003_resp.yaml#/components/responses/400
+        "401":
+          $ref: ../responses/SOL002SOL003_resp.yaml#/components/responses/401
+        "403":
+          $ref: ../responses/SOL002SOL003_resp.yaml#/components/responses/403
+        "404":
+          $ref: ../responses/SOL002SOL003_resp.yaml#/components/responses/404
+        "405":
+          $ref: ../responses/SOL002SOL003_resp.yaml#/components/responses/405
+        "406":
+          $ref: ../responses/SOL002SOL003_resp.yaml#/components/responses/406
+        "413":
+          $ref: ../responses/SOL002SOL003_resp.yaml#/components/responses/413
+        "414":
+          $ref: ../responses/SOL002SOL003_resp.yaml#/components/responses/414
+        "416":
+          $ref: ../responses/SOL002SOL003_resp.yaml#/components/responses/416
+        "422":
+          $ref: ../responses/SOL002SOL003_resp.yaml#/components/responses/422
+        "429":
+          $ref: ../responses/SOL002SOL003_resp.yaml#/components/responses/429
+        "500":
+          $ref: ../responses/SOL002SOL003_resp.yaml#/components/responses/500
+        "503":
+          $ref: ../responses/SOL002SOL003_resp.yaml#/components/responses/503
+        "504":
+          $ref: ../responses/SOL002SOL003_resp.yaml#/components/responses/504
+
+components:
+  responses:
+    ApiVersions.Get:
+      description: >
+        200 OK
+
+        API version information was read successfully.
+        The response body shall contain 4.4 API version
+        information, as defined in clause 4.4.1.13.
+      headers:
+        Content-Type:
+          description: The MIME type of the body of the response.
+          schema:
+            type: string
+            maximum: 1
+            minimum: 1
+        Version:
+          description: The used API version.
+          schema:
+            type: string
+            maximum: 1
+            minimum: 1
+      content:
+        application/json:
           schema:
-            $ref: '../definitions/SOL002SOL003_def.yaml#/definitions/ApiVersionInformation'
-          headers:
-            Content-Type:
-              description: The MIME type of the body of the response.
-              schema:
-                type: string
-                maximum: 1
-                minimum: 1
-            Version:
-              description: The used API version.
-              schema:
-                type: string
-                maximum: 1
-                minimum: 1
-        400: { $ref: '../responses/SOL002SOL003_resp.yaml#/components/responses/400' }
-        401: { $ref: '../responses/SOL002SOL003_resp.yaml#/components/responses/401' }
-        403: { $ref: '../responses/SOL002SOL003_resp.yaml#/components/responses/403' }
-        404: { $ref: '../responses/SOL002SOL003_resp.yaml#/components/responses/404' }
-        405: { $ref: '../responses/SOL002SOL003_resp.yaml#/components/responses/405' }
-        406: { $ref: '../responses/SOL002SOL003_resp.yaml#/components/responses/406' }
-        413: { $ref: '../responses/SOL002SOL003_resp.yaml#/components/responses/413' }
-        414: { $ref: '../responses/SOL002SOL003_resp.yaml#/components/responses/414' }
-        416: { $ref: '../responses/SOL002SOL003_resp.yaml#/components/responses/416' }
-        422: { $ref: '../responses/SOL002SOL003_resp.yaml#/components/responses/422' }
-        429: { $ref: '../responses/SOL002SOL003_resp.yaml#/components/responses/429' }
-        500: { $ref: '../responses/SOL002SOL003_resp.yaml#/components/responses/500' }
-        503: { $ref: '../responses/SOL002SOL003_resp.yaml#/components/responses/503' }
-        504: { $ref: '../responses/SOL002SOL003_resp.yaml#/components/responses/504' }
\ No newline at end of file
+            $ref: '../definitions/SOL002SOL003_def.yaml#/definitions/ApiVersionInformation'
\ No newline at end of file