diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml
index 1e97550d85aa8a0f8e92035a8e39be39b81157bb..77b62f5305477d6532f74ea3e3945cd49b3983be 100644
--- a/OpenAPI/TS28105_AiMlNrm.yaml
+++ b/OpenAPI/TS28105_AiMlNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: AI/ML NRM
-  version: 17.2.0
+  version: 17.3.0
   description: >-
     OAS 3.0.1 specification of the AI/ML NRM
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -169,19 +169,19 @@ components:
                   properties:
                     mLEntityId:
                       type: string
-                    candidateTraingDataSource:
+                    candidateTrainingDataSource:
                       type: array
                       items:
                         type: string
-                    traingDataQualityScore:
+                    trainingDataQualityScore:
                       type: number
                       format: float
                     trainingRequestSource:
-                      type: string
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     requestStatus:
                       $ref: '#/components/schemas/RequestStatus'
                     expectedRuntimeContext:
-                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+                      $ref: '#/components/schemas/MLContext'
                     performanceRequirements:
                       $ref: '#/components/schemas/PerformanceRequirements'
                     cancelRequest:
@@ -241,7 +241,14 @@ components:
                         $ref: '#/components/schemas/ModelPerformance'
                     areNewTrainingDataUsed:
                       type: boolean
-
+                    trainingRequestRef:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+                    trainingProcessRef:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+                    trainingReportRef:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+                    lastTrainingRef:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
 
 #-------- Definition of JSON arrays for name-contained IOCs ----------------------
 
diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index 0257e341ea2bcfa51fe8918dc263d6d8ef4c7987..a9fb33655fe972207551e75300cbe3b1d85b5f18 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Intent NRM
-  version: 17.1.0
+  version: 17.3.0
   description: >-
     OAS 3.0.1 definition of the Intent NRM
     © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -219,6 +219,10 @@ components:
         - IS_GREATER_THAN
         - IS_WITHIN_RANGE
         - IS_OUTSIDE_RANGE
+        - IS_ONE_OF
+        - IS_NOT_ONE_OF
+        - IS_EQUAL_TO_OR_LESS_THAN
+        - IS_EQUAL_TO_OR_GREATER_THAN
     FulfilStatus:
       type: string
       enum:
@@ -539,7 +543,7 @@ components:
         This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget     
       type: object
       properties:
-        targetAttribute:
+        targetName:
           type: string
           enum:
             - maxNumberofUEs
@@ -554,7 +558,7 @@ components:
         This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget       
       type: object
       properties:
-        targetAttribute:
+        targetName:
           type: string
           enum:
             - activityFactor
@@ -569,7 +573,7 @@ components:
         This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget      
       type: object
       properties:
-        targetAttribute:
+        targetName:
           type: string
           enum:
             - uESpeed
@@ -647,7 +651,7 @@ components:
         contextValueRange:
           type: array
           items:
-            $ref: "TS28541_NrNrm.yaml#/components/schemas/PlmnId"
+            $ref: "TS28623_ComDefs.yaml#/components/schemas/PlmnId"
     NRFqBandContext:
       description: >-
         This data type is the "ObjectContext" data type with specialisations for NRFqBandContext       
diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml
index 4b3554df76be35f34fadedd3afce3ccb10a07c76..0bd11282dcb245254f17549440cc52562d3553bc 100644
--- a/OpenAPI/TS28538_EdgeNrm.yaml
+++ b/OpenAPI/TS28538_EdgeNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: 3GPP Edge NRM
-  version: 17.1.0
+  version: 17.2.0
   description: >-
     OAS 3.0.1 specification of the Edge NRM
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -31,7 +31,7 @@ components:
         trackingAreaIdList:
           $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList'
         servingPLMN:
-          $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
     GeoLoc:
       type: object
       properties:
diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index a50921f0bfd2d564db195c8b76ed981c0ac4b5b8..cbaf524c35feb90f2d46cdf93726bc15aefd3e9c 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: 3GPP 5GC NRM
-  version: 17.7.0
+  version: 17.10.0
   description: >-
     OAS 3.0.1 specification of the 5GC NRM
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -67,7 +67,7 @@ components:
         nFStatus:
           $ref: '#/components/schemas/NFStatus'
         plmn:
-          $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         sNssais:
           $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'
         fqdn:
@@ -101,7 +101,7 @@ components:
         apiPrfix:
           type: string
         allowedPlmns:
-          $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         allowedNfTypes:
           type: array
           items:
@@ -209,7 +209,7 @@ components:
         allowedPLMNs:
           type: array
           items:
-            $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         allowedSNPNs:
           type: array
           items:
@@ -248,6 +248,22 @@ components:
           type: array
           items:
             type: string
+        recoveryTime:
+           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+        nfServicePersistence:
+           type: boolean
+        nfProfileChangesSupportInd:
+           type: boolean
+        defaultNotificationSubscriptions:
+          type: array
+          items:
+            $ref: '#/components/schemas/DefaultNotificationSubscription'
+          minItems: 1
+        serviceSetRecoveryTimeList:
+          type: array
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+          minItems: 1
         vendorId:
           type: string
     SEPPType:
@@ -539,7 +555,7 @@ components:
       type: object
       properties:
         plmnId:
-          $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         nRTACRangelist:
           type: array
           items:
@@ -549,7 +565,7 @@ components:
       type: object
       properties:
           pLMNId: 
-            $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
           aMFIdentifier:
             type: integer   
        
@@ -582,16 +598,6 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/DnnSmfInfoItem'
-    
-    IpAddr:
-      type: object
-      properties:
-        ipv4Addr:
-          type: string
-        ipv6Addr:
-          type: string
-        ipv6Prefix:
-          type: string
 
     5GCNfConnEcmInfoList:
       type: array
@@ -890,7 +896,7 @@ components:
                     pgwAddrList:
                       type: array
                       items:
-                        $ref: '#/components/schemas/IpAddr'
+                        $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr'
                     accessType:
                       $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType'
                     priority:
@@ -1265,7 +1271,7 @@ components:
                 - type: object
                   properties:
                     plmnId:
-                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
                     sEPPType:
                       $ref: '#/components/schemas/SEPPType'
                     sEPPId:
@@ -1384,7 +1390,7 @@ components:
                 - type: object
                   properties:
                     plmnId:
-                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
                     sBIFqdn:
                       type: string
                     managedNFProfile:
@@ -1414,7 +1420,7 @@ components:
                 - type: object
                   properties:
                     plmnId:
-                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
                     sBIFqdn:
                       type: string
                     managedNFProfile:
@@ -1511,7 +1517,7 @@ components:
                 - type: object
                   properties:
                     plmnId:
-                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
                     sEPPId:
                       type: integer
                     fqdn:
@@ -1844,7 +1850,7 @@ components:
                 - type: object
                   properties:
                     remotePlmnId:
-                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
                     remoteSeppAddress:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr'
                     remoteSeppId:
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index d5b7e5189767279e204e206b59b4f144e96437cf..36b24103a8fb73dfd180bffa6d541a63fae6d3a7 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: NR NRM
-  version: 17.8.0
+  version: 17.10.0
   description: >-
     OAS 3.0.1 specification of the NR NRM
     © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -44,25 +44,15 @@ components:
         sd:
           type: string
 
-    Mnc:
-      type: string
-      pattern: '[0-9]{3}|[0-9]{2}'
-    PlmnId:
-      type: object
-      properties:
-        mcc:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc'
-        mnc:
-          $ref: '#/components/schemas/Mnc'
     PlmnIdList:
       type: array
       items:
-        $ref: '#/components/schemas/PlmnId'
+        $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
     PlmnInfo:
       type: object
       properties:
         plmnId:
-          $ref: '#/components/schemas/PlmnId'
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         snssai:
           $ref: '#/components/schemas/Snssai'
     PlmnInfoList:
@@ -77,7 +67,7 @@ components:
       type: object
       properties:
         plmnId:
-          $ref: '#/components/schemas/PlmnId'
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         cagidList:
           $ref: '#/components/schemas/cagId'
         nidList:
@@ -117,7 +107,7 @@ components:
       type: object
       properties:
         plmnId:
-          $ref: '#/components/schemas/PlmnId'
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         nrTac:
           $ref: '#/components/schemas/NrTac'
     TaiList:
@@ -287,7 +277,7 @@ components:
       type: object
       properties:
         plmnId:
-          $ref: '#/components/schemas/PlmnId'
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         snssai:
           $ref: '#/components/schemas/Snssai'
     RrmPolicyMemberList:
@@ -587,7 +577,7 @@ components:
         TceID:
           type: integer
         PlmnTarget:
-          $ref: '#/components/schemas/PlmnId'
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
     TceMappingInfoList:
       type: array
       items:
@@ -822,7 +812,7 @@ components:
                     gnbCuName:
                       $ref: '#/components/schemas/GnbName'
                     plmnId:
-                      $ref: '#/components/schemas/PlmnId'
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
                     x2BlockList:
                       $ref: '#/components/schemas/GGnbIdList'
                     xnBlockList:
@@ -1588,7 +1578,7 @@ components:
                     gnbIdLength:
                       $ref: '#/components/schemas/GnbIdLength'
                     plmnId:
-                      $ref: '#/components/schemas/PlmnId'
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml
index c66944fe7d9bba66a8e337927a65cfd4dc702bec..17cfbffd67146b41bb9d43574f42bfd57ed1d4b2 100755
--- a/OpenAPI/TS28541_SliceNrm.yaml
+++ b/OpenAPI/TS28541_SliceNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Slice NRM
-  version: 17.8.0
+  version: 17.10.0
   description: >-
     OAS 3.0.1 specification of the Slice NRM
     @ 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -374,8 +374,6 @@ components:
           type: integer
         reliability:
           type: number
-        sST:
-          $ref: 'TS28541_NrNrm.yaml#/components/schemas/Sst'
         dLMaxPktSize:
           type: integer
         uLMaxPktSize:
@@ -449,8 +447,6 @@ components:
           type: integer
         reliability:
           type: number
-        sST:
-          $ref: 'TS28541_NrNrm.yaml#/components/schemas/Sst'
         dLDeterministicComm:
           $ref: '#/components/schemas/DeterministicComm'
         uLDeterministicComm:
@@ -517,8 +513,10 @@ components:
             $ref: '#/components/schemas/UserMgmtOpen'
           v2XCommModels:
             $ref: '#/components/schemas/V2XCommModels'
-          coverageArea:
-            type: string
+          coverageAreas:
+            type: array
+            items:
+              type: string
           termDensity:
             $ref: '#/components/schemas/TermDensity'
           activityFactor:
diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml
index bec1fadcfa96fdf73d269433f03482558f3f2474..4f4d83bc94ba1623994f6d2d4e8712000461a459 100755
--- a/OpenAPI/TS28623_ComDefs.yaml
+++ b/OpenAPI/TS28623_ComDefs.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Common Type Definitions
-  version: 17.2.0
+  version: 17.5.0
   description: >-
     OAS 3.0.1 specification of common type definitions in the Generic NRM
     © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -78,6 +78,8 @@ components:
           $ref: '#/components/schemas/Latitude'
         longitude:
           $ref: '#/components/schemas/Longitude'
+        altitude:
+          $ref: '#/components/schemas/Float'
     ConvexGeoPolygon:
       type: array
       items:
@@ -133,6 +135,7 @@ components:
       oneOf:
         - $ref: '#/components/schemas/Ipv4Addr'
         - $ref: '#/components/schemas/Ipv6Addr'
+        - $ref: '#/components/schemas/Ipv6Prefix'
     HostAddr:
       #  This definition will be deprecated, when all occurances of HostAddr
       #  are replaced by Host.
diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 6629b061a28552b4f76e68ca525f4bbfd3278a31..4000c16b09a8d0a71d973b2b877200d7c7f421f6 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Generic NRM
-  version: 17.2.0
+  version: 17.5.0
   description: >-
     OAS 3.0.1 definition of the Generic NRM
     © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -151,7 +151,7 @@ components:
              - FILE_BASED_LOC_SET_BY_PRODUCER
              - FILE_BASED_LOC_SET_BY_CONSUMER
              - STREAM_BASED 
-        monitorGranularityPeriods:
+        reportingPeriods:
           type: array
           items:
             type: integer
@@ -1444,6 +1444,8 @@ components:
             - 150ms
             - 300ms
             - 500ms
+      minItems: 0
+      maxItems: 255
 
 #-------- end of Definition of types used in Trace control NRM fragment ----------
 
diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 8973508d276c77df472280d33ee8d8cfc0e13961..c7a88e6e605d7e77d45296663154132bcad956bd 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -471,7 +471,7 @@ module _3gpp-common-trace {
         The attribute is applicable for both Trace and MDT.";
     }
 
-    leaf traceReportingFormat {
+    leaf tjTraceReportingFormat {
       type enumeration {
         enum FILE_BASED;
         enum STREAMING;
@@ -1049,15 +1049,15 @@ module _3gpp-common-trace {
         identifies a Trace session. One Trace Session may be activated to 
         multiple Network Elements. The traceReference is populated by the 
         consumer that makes the request for a Trace Session.
-        
-        The attribute jobType specifies the kind of data to collect. Dependent 
-        on the selected type various parameters shall be available. The 
-        attributes jobType, traceReference, 
-        traceCollectionEntityAddress and traceReportingFormat are mandatory 
-        for all job types. If streaming reporting is selected for 
-        traceReportingFormat, streamingTraceConsumerURI shall be present 
-        additionally. The attribute PLMNTarget shall be present if trace 
-        activation method is management based.
+
+        The attribute tjJobType specifies the kind of data to collect. 
+        Dependent on the selected type various parameters shall be available.
+        The attributes tjJobType, tjTraceReference, 
+        tjTraceCollectionEntityAddress and tjTraceReportingFormat are 
+        mandatory for all job types. If streaming reporting is selected 
+        for tjTraceReportingFormat, tjStreamingTraceConsumerURI shall be 
+        present additionally. The attribute tjPLMNTarget shall be present 
+        if trace activation method is management based.
 
         For the different job types the attributes are differentiated as follows:
         - In case of TRACE_ONLY additionally the following attributes shall be 
@@ -1138,4 +1138,4 @@ module _3gpp-common-trace {
       }
     }
   }
-}
\ No newline at end of file
+}