diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml
index 8fdcf8f9b6c96dc51c07c27edfa14b0834b854f8..239d6b5cbddb1ef2b27750786c192ed94fb7cf7b 100644
--- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml
+++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml
@@ -1155,8 +1155,6 @@ definitions:
                 In case this attribute is present, IP addresses are bound
                 to that subnet.
               $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVim"
-
-
       type:
         description: >
           The type of the IP addresses
@@ -1896,7 +1894,7 @@ definitions:
           Parameters for configuring the network protocols on the SAP.
         type: array
         items:
-          $ref: "../../definitions/SOL005_def.yaml#/definitions/CpProtocolData"
+          $ref: "#/definitions/CpProtocolData"
 
   ScaleNsRequest:
     description: >
@@ -2196,13 +2194,13 @@ definitions:
           Information about external VLs to connect the VNF to.
         type: array
         items:
-          $ref: "../../definitions/SOL005_def.yaml#/definitions/ExtVirtualLinkData"
+          $ref: "#/definitions/ExtVirtualLinkData"
       extManagedVirtualLinks:
         description: >
           Information about internal VLs that are managed by other entities than the VNFM.
         type: array
         items:
-          $ref: "../../definitions/SOL005_def.yaml#/definitions/ExtManagedVirtualLinkData"
+          $ref: "#/definitions/ExtManagedVirtualLinkData"
       localizationLanguage:
         description: >
           Localization language of the VNF to be instantiated.
@@ -2244,13 +2242,13 @@ definitions:
           Information about external VLs to connect the VNF to.
         type: array
         items:
-          $ref: "../../definitions/SOL005_def.yaml#/definitions/ExtVirtualLinkData"
+          $ref: "#/definitions/ExtVirtualLinkData"
       extManagedVirtualLinks:
         description: >
           information about internal VLs that are managed by NFVO.
         type: array
         items:
-          $ref: "../../definitions/SOL005_def.yaml#/definitions/ExtManagedVirtualLinkData"
+          $ref: "#/definitions/ExtManagedVirtualLinkData"
       additionalParams:
         description: >
           Additional input parameters for the flavor change
@@ -2380,7 +2378,7 @@ definitions:
           Information about external VLs to change (e.g. connect the VNF to).
         type: array
         items:
-          $ref: "../../definitions/SOL005_def.yaml#/definitions/ExtVirtualLinkData"
+          $ref: "#/definitions/ExtVirtualLinkData"
       additionalParams:
         description: >
           Additional parameters passed by the OSS as input to
@@ -2623,7 +2621,7 @@ definitions:
           Indicates values of specific bits in a frame.
         type: array
         items:
-          $ref: "../../definitions/SOL005_def.yaml#/definitions/Mask"
+          $ref: "#/definitions/Mask"
 
   ChangeNsFlavourData:
     description: >
diff --git a/src/SOL005/definitions/SOL005_def.yaml b/src/SOL005/definitions/SOL005_def.yaml
index e5b3685638fe79236d70d969d3536978e3d56a5b..7d2729896e38afdaa0b2fcb778aad54edc4898ac 100644
--- a/src/SOL005/definitions/SOL005_def.yaml
+++ b/src/SOL005/definitions/SOL005_def.yaml
@@ -60,6 +60,7 @@ definitions:
       A MAC address. Representation: string that consists of groups of two hexadecimal digits,
       separated by hyphens or colons.
     type: string
+    format: MAC
 
   IpAddress:
     description: >
@@ -67,9 +68,7 @@ definitions:
       integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that
       consists of groups of zero to four hexadecimal digits, separated by colons.
     type: string
-    format:
-      - ipv4
-      - ipv6
+    format: IP
 
   IpAddressPrefix:
     description: >
diff --git a/src/SOL005/responses/SOL005_resp.yaml b/src/SOL005/responses/SOL005_resp.yaml
index d7ec415f796488b63d71fdb545948651da9734ff..81871d3ce9a6ccfd22084f0e832ebb0ab133750e 100644
--- a/src/SOL005/responses/SOL005_resp.yaml
+++ b/src/SOL005/responses/SOL005_resp.yaml
@@ -38,7 +38,7 @@ responses:
         maximum: 1
         minimum: 1
     schema:
-      $ref: "../../NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml#/definitions/NsInstance"
+      $ref: "../NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml#/definitions/NsInstance"
   202-with-Location-empty:
     description: >
       202 ACCEPTED