diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang
index 1eb49ce02f133723d16093debe9c6aef98d1397a..a44b669715abe65b9a121795ab0359c7d36c2e4a 100644
--- a/src/yang/etsi-nfv-ns.yang
+++ b/src/yang/etsi-nfv-ns.yang
@@ -159,54 +159,52 @@ submodule etsi-nfv-ns {
             "GS NFV IFA014: Section 6.2.3.2 Sapd information element";
         }
 
-        choice associated-cpd-id {
-          container vnf {
-            leaf vnfd-id {
-              mandatory true;
-              type leafref {
-                path "../../../../vnfd/id";
-              }
-              must "boolean(../../../vnfd-id[.=current()])";
+        container vnf {
+          leaf vnfd-id {
+            mandatory true;
+            type leafref {
+              path "../../../../vnfd/id";
             }
+            must "boolean(../../../vnfd-id[.=current()])";
+          }
 
-            leaf ext-cpd-id {
-              mandatory true;
-              type leafref {
-                path "deref(../vnfd-id)/../ext-cpd/id";
-              }
+          leaf ext-cpd-id {
+            mandatory true;
+            type leafref {
+              path "deref(../vnfd-id)/../ext-cpd/id";
             }
           }
+        }
 
-          container pnf {
-            leaf pnfd-id {
-              mandatory true;
-              type leafref {
-                path "../../../../pnfd/id";
-              }
-              must "boolean(../pnfd-id[.=current()])";
+        container pnf {
+          leaf pnfd-id {
+            mandatory true;
+            type leafref {
+              path "../../../../pnfd/id";
             }
+            must "boolean(../pnfd-id[.=current()])";
+          }
 
-            leaf ext-cpd-id {
-              mandatory true;
-              type leafref {
-                path "deref(../pnfd-id)/../ext-cpd/id";
-              }
+          leaf ext-cpd-id {
+            mandatory true;
+            type leafref {
+              path "deref(../pnfd-id)/../ext-cpd/id";
             }
           }
-          container ns {
-            leaf nsd-id {
-              mandatory true;
-              type leafref {
-                path "../../../../nsd/id";
-              }
-              must "boolean(../nsd-id[.=current()])";
+        }
+        container ns {
+          leaf nsd-id {
+            mandatory true;
+            type leafref {
+              path "../../../../nsd/id";
             }
+            must "boolean(../nsd-id[.=current()])";
+          }
 
-            leaf ext-cpd-id {
-              mandatory true;
-              type leafref {
-                path "deref(../nsd-id)/../sapd/id";
-              }
+          leaf ext-cpd-id {
+            mandatory true;
+            type leafref {
+              path "deref(../nsd-id)/../sapd/id";
             }
           }
         }