diff --git a/src/SOL011/NSDManagement/NSDManagement.yaml b/src/SOL011/NSDManagement/NSDManagement.yaml
index b6bf4d9902749ed6e7824621caf17974c5b3b21e..e641237587d340afc26299f4f8163f327c7e0e36 100644
--- a/src/SOL011/NSDManagement/NSDManagement.yaml
+++ b/src/SOL011/NSDManagement/NSDManagement.yaml
@@ -215,14 +215,20 @@ components:
       description: >
         This type represents a response for the query NSD operation.
       type: object
-      required:
-        - id
-        - nsdOnboardingState
-        - nsdOperationalState
-        - nsdUsageState
-        - _links
-        - oneOf:
+      oneOf:
+        - required:
+          - id
+          - nsdOnboardingState
+          - nsdOperationalState
+          - nsdUsageState
+          - _links
           - vnfPkgId
+        - required:
+          - id
+          - nsdOnboardingState
+          - nsdOperationalState
+          - nsdUsageState
+          - _links
           - nestedNsdInfoId
       properties:
         id: