diff --git a/example-data/complex-vnfd.xml b/example-data/complex-vnfd.xml
index 9aa8ec9d57eddb0eea47c6b119bb85828772e9da..56ef89ab6c2be628df5822d88ee023b355b4b266 100644
--- a/example-data/complex-vnfd.xml
+++ b/example-data/complex-vnfd.xml
@@ -156,17 +156,13 @@
         <id>control-plane-active</id>
         <min-number-of-instances>1</min-number-of-instances>
         <max-number-of-instances>1</max-number-of-instances>
-        <affinity-or-anti-affinity-group>
-          <id>control-plane</id>
-        </affinity-or-anti-affinity-group>
+        <affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>
       </vdu-profile>
       <vdu-profile>
         <id>control-plane-standby</id>
         <min-number-of-instances>1</min-number-of-instances>
         <max-number-of-instances>1</max-number-of-instances>
-        <affinity-or-anti-affinity-group>
-          <id>control-plane</id>
-        </affinity-or-anti-affinity-group>
+        <affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>
       </vdu-profile>
       <vdu-profile>
         <id>data-plane</id>
@@ -227,17 +223,13 @@
         <id>control-plane-active</id>
         <min-number-of-instances>1</min-number-of-instances>
         <max-number-of-instances>1</max-number-of-instances>
-        <affinity-or-anti-affinity-group>
-          <id>control-plane</id>
-        </affinity-or-anti-affinity-group>
+        <affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>
       </vdu-profile>
       <vdu-profile>
         <id>control-plane-standby</id>
         <min-number-of-instances>1</min-number-of-instances>
         <max-number-of-instances>1</max-number-of-instances>
-        <affinity-or-anti-affinity-group>
-          <id>control-plane</id>
-        </affinity-or-anti-affinity-group>
+        <affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>
       </vdu-profile>
       <vdu-profile>
         <id>data-plane</id>
diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang
index 8aa781a774d201e20b35fc7c62e8c0f393293136..8ca1f3e8f1f924977a2b82c37e9e9b2ec312eafd 100644
--- a/src/yang/etsi-nfv-ns.yang
+++ b/src/yang/etsi-nfv-ns.yang
@@ -792,21 +792,16 @@ submodule etsi-nfv-ns {
 
         uses local-affinity-or-anti-affinity-rule;
 
-        list affinity-or-anti-affinity-group {
-          key "id";
-
+        leaf-list affinity-or-anti-affinity-group-id {
+          type leafref {
+            path "../../affinity-or-anti-affinity-group/id";
+          }
           description
             "Identifier(s) of the affinity or anti-affinity
              group(s) the VnfProfile belongs to.";
           reference
             "GS NFV IFA014: Section 6.3.3.2 VnfProfile information
              element";
-
-          leaf id {
-            type leafref {
-              path "../../../affinity-or-anti-affinity-group/id";
-            }
-          }
         }
 
         list virtual-link-connectivity {
@@ -1004,9 +999,10 @@ submodule etsi-nfv-ns {
 
         uses local-affinity-or-anti-affinity-rule;
 
-        list affinity-or-anti-affinity-group {
-          key "id";
-
+        leaf-list affinity-or-anti-affinity-group-id {
+          type leafref {
+            path "../../affinity-or-anti-affinity-group/id";
+          }
           description
             "Identifies an affinity or anti-affinity group the
              VLs instantiated according to the VlProfile belong
@@ -1014,12 +1010,6 @@ submodule etsi-nfv-ns {
           reference
             "GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile
              information element";
-
-          leaf id {
-            type leafref {
-              path "../../../affinity-or-anti-affinity-group/id";
-            }
-          }
         }
 
         container max-bitrate-requirements {
@@ -1452,21 +1442,16 @@ submodule etsi-nfv-ns {
              element";
         }
 
-        list affinity-or-anti-affinity-group-id {
-          key "id";
-
+        leaf-list affinity-or-anti-affinity-group-id {
+          type leafref {
+            path "../../affinity-or-anti-affinity-group/id";
+          }
           description
             "Identifies an affinity or anti-affinity group the NSs
              created according to this NsProfile belongs to.";
           reference
             "GS NFV IFA014: Section 6.3.11.2 NsProfile information
              element";
-
-          leaf id {
-            type leafref {
-              path "../../../affinity-or-anti-affinity-group/id";
-            }
-          }
         }
 
         list virtual-link-connectivity {
diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang
index 26cb57496417638ece2668566b7df73a481d9861..ef91949cc74009f60ea6d5bbdfb7f74f1d7dd93a 100755
--- a/src/yang/etsi-nfv-vnf.yang
+++ b/src/yang/etsi-nfv-vnf.yang
@@ -1566,27 +1566,16 @@ submodule etsi-nfv-vnf {
         }
         uses local-affinity-or-anti-affinity-rule;
 
-        list affinity-or-anti-affinity-group {
-          key "id";
-
+        leaf-list affinity-or-anti-affinity-group-id {
+          type leafref {
+            path "../../affinity-or-anti-affinity-group/id";
+          }
           description
             "Identifier(s) of the affinity or anti-affinity
              group(s) the VDU belongs to.";
           reference
             "GS NFV IFA011: Section 7.1.8.3, VduProfile information
              element.";
-          leaf id {
-            type leafref {
-              path "../../../" +
-                "affinity-or-anti-affinity-group/id";
-            }
-            description
-              "Identifies an affinity or anti-affinity group to
-               which the affinity or anti-affinity rule applies.";
-            reference
-              "GS NFV IFA011: Section 7.1.8.12, AffinityOrAntiAffinity
-               information element.";
-          }
         }
       }
 
@@ -1623,12 +1612,9 @@ submodule etsi-nfv-vnf {
         }
         uses local-affinity-or-anti-affinity-rule;
 
-        list affinity-or-anti-affinity-group {
-          key "id";
-          leaf id {
-            type leafref {
-              path "../../../affinity-or-anti-affinity-group/id";
-            }
+        leaf-list affinity-or-anti-affinity-group-id {
+          type leafref {
+            path "../../affinity-or-anti-affinity-group/id";
           }
           description
             "Identifier(s) of the affinity or anti-affinity