diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml
index 2f0530b4b431159de2ead876ca9a0cc25430fc2b..3071fa954d85607a442de34677c2801e8f74147d 100644
--- a/OpenAPI/TS28104_MdaNrm.yaml
+++ b/OpenAPI/TS28104_MdaNrm.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: MDA NRM
-  version: 18.6.0
+  version: 18.7.0
   description: >-
     OAS 3.0.1 specification of the MDA NRM
-    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.104; MDA 
@@ -60,7 +60,7 @@ components:
       type: object
       properties:
         mDAType:
-          type: string
+          $ref: '#/components/schemas/MDAType'
         mDAOutputIEFilters:
           type: array
           items:
diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml
index f3b97098d7412a5871fd6f7e33cd397990e2373f..ae1b0c0ad64b88c699be7ef4f284600e996ed651 100644
--- a/OpenAPI/TS28104_MdaReport.yaml
+++ b/OpenAPI/TS28104_MdaReport.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: MDA Report
-  version: 18.6.0
+  version: 18.7.0
   description: >-
     OAS 3.0.1 specification of the MDA Report
-    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.104; MDA Report
@@ -19,7 +19,7 @@ components:
       type: object
       properties:
         mDAType:
-          type: string
+          $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType'
         mDAOutputList:
           type: array
           items:
diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml
index e85c31cb2e818b5b2cc2843ab83faf18fb97f211..5e24d900043bc63d68516f06f5aef2b6e30261b8 100644
--- a/OpenAPI/TS28105_AiMlNrm.yaml
+++ b/OpenAPI/TS28105_AiMlNrm.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: AI/ML NRM
-  version: 18.6.0
+  version: 18.7.0
   description: >-
     OAS 3.0.1 specification of the AI/ML NRM
-    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.105; AI/ML Management
@@ -249,7 +249,9 @@ components:
                     trainingDataQualityScore:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float'
                     trainingRequestSource:
-                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+                      oneOf:
+                      - type: string
+                      - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     requestStatus:
                       $ref: '#/components/schemas/RequestStatus'
                     expectedRuntimeContext:
diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 82448ccc66cf155fc5b825855395adfab01d58dc..c231b37d57dea7f9ddae893b3c7e8e6ad4683cda 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: 3GPP 5GC NRM
-  version: 18.10.0
+  version: 18.11.0
   description: >-
     OAS 3.0.1 specification of the 5GC NRM
-    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.541; 5G NRM, 5GC NRM
@@ -147,8 +147,6 @@ components:
       type: array
       items:
         $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'
-    WeightFactor:
-      type: integer
     VendorId:
       type: string
       description: Vendor ID of the NF Service instance (Private Enterprise Number assigned by IANA)
@@ -2342,9 +2340,47 @@ components:
         blockedLocation:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         blockedDurWindow:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
+          type: array
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
         blockedSlice:
           $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'
+    SatelliteCoverageInfoList:
+      description: SatelliteCoverageInfoList that relates to NR Satellite RAT type and corresponding information of satellite coverage
+      type: array
+      items:
+        $ref: '#/components/schemas/SatelliteCoverageInfo'
+    SatelliteCoverageInfo:
+      description: This datatype defines information related to NR Satellite RAT type and corresponding information of satellite coverage
+      type: object
+      properties:
+        nRSatelliteRATtype:
+          anyOf:
+          - type: string
+            enum:
+              - NRLEO
+              - NRMEO
+              - NRGEO
+              - NROTHERSAT
+          - type: string
+        locationInfo:
+          type: array
+          items:
+            $ref: '#/components/schemas/NtnLocationInfo'
+    NtnLocationInfo:
+      description: This datatype defines the information about locations and corresponding time windows
+      type: object
+      properties:
+        location:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
+        availabilityWindows:
+          type: array
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
+        nonAvailabilityWindows:
+          type: array
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'          
     5GDdnmfInfo:
       description: Information of an 5G DDNMF NF Instance
       type: object
@@ -3037,8 +3073,6 @@ components:
                       $ref: '#/components/schemas/AmfIdentifier'
                     sBIFqdn:
                       type: string
-                    weightFactor:
-                      $ref: '#/components/schemas/WeightFactor'
                     cNSIIdList:
                       $ref: '#/components/schemas/CNSIIdList'
                     amfSetRef:
@@ -3049,6 +3083,8 @@ components:
                       $ref: '#/components/schemas/CommModelList'
                     nTNPLMNRestrictionsList:
                       $ref: '#/components/schemas/NTNPLMNRestrictionsList'
+                    satelliteCoverageInfoList:
+                      $ref: '#/components/schemas/SatelliteCoverageInfoList'                      
                     amfInfo:
                       $ref: '#/components/schemas/AmfInfo'
                     sliceExpiryInfo:
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 75137816541eb8855298fab5feb48709e7143e78..f724f144b0d7278874c5c72f16b1f93416ea0f1e 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: NR NRM
-  version: 18.10.0
+  version: 18.11.0
   description: >-
     OAS 3.0.1 specification of the NR NRM
-    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.541; 5G NRM, NR NRM
@@ -167,19 +167,11 @@ components:
           type: integer
           minimum: 0
           maximum: 100
-        maxNumberOfPreamblesSent:
-          enum:
-            - n3
-            - n4
-            - n5
-            - n6
-            - n7
-            - n8
-            - n10
-            - n20
-            - n50
-            - n100
-            - n200
+        numberOfPreamblesSent:
+          type: integer
+          minimum: 0
+          maximum: 200
+
 
     UeAccDelayProbabilityDist:
       type: array
@@ -246,10 +238,8 @@ components:
     CyclicPrefix:
       type: string
       enum:
-        - '15'
-        - '30'
-        - '60'
-        - '120'
+        - NORMAL,
+        - EXTENDED
     TxDirection:
       type: string
       enum:
@@ -267,8 +257,6 @@ components:
       enum:
         - INITIAL
         - OTHER
-        - SUL
-
     IsESCoveredBy:
       type: string
       enum:
@@ -739,7 +727,8 @@ components:
           $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple'
         CCOFunction:
           $ref: '#/components/schemas/CCOFunction-Single'
-
+        NTNFunction:
+          $ref: '#/components/schemas/NTNFunction-Single'
     ManagedElement-ncO-NrNrm:
       type: object
       properties:
@@ -767,6 +756,8 @@ components:
           $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple'
         Dynamic5QISet:
           $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple'
+        NTNFunction:
+          $ref: '#/components/schemas/NTNFunction-Single'
 
 #-------- Definition of abstract IOCs --------------------------------------------
 
@@ -925,7 +916,7 @@ components:
                       $ref: '#/components/schemas/GGnbIdList'
                     x2HOBlockList:
                       $ref: '#/components/schemas/GEnbIdList'
-                    xnHOBlackList:
+                    xnHOBlockList:
                       $ref: '#/components/schemas/GGnbIdList'
                     mappingSetIDBackhaulAddress:
                       type: array
diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml
index 8c62eb9d1c7ff132eeb2095893ade4892db71a38..6a51002c7c66f53f2beb16fd29f44f7902c467ed 100755
--- a/OpenAPI/TS28623_ComDefs.yaml
+++ b/OpenAPI/TS28623_ComDefs.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: Common Type Definitions
-  version: 18.9.0
+  version: 18.10.0
   description: >-
     OAS 3.0.1 specification of common type definitions in the Generic NRM
-    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.623; Generic NRM; Common type definitions
@@ -106,17 +106,15 @@ components:
           $ref: '#/components/schemas/Longitude'
         altitude:
           $ref: '#/components/schemas/Float'
-    GeoPolygon:
-      type: array
-      items:
-        $ref: '#/components/schemas/GeoCoordinate'
-      minItems: 1
     GeoArea:
       oneOf:
         - type: object
           properties:
             geoPolygon:
-              $ref: '#/components/schemas/GeoCoordinate'
+              type: array
+              items:
+                $ref: '#/components/schemas/GeoCoordinate'
+              minItems: 1
     GeoAreaToCellMapping:
       type: object
       properties: