diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 105d173ed9bd11181c861deac47c161e8060de9a..3755da9a624d233dcd2b1823c3dede9e9e924e2e 100644
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: NR NRM
-  version: 16.21.0
+  version: 16.22.0
   description: >-
     OAS 3.0.1 specification of the NR NRM
-    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.541; 5G NRM, NR NRM
@@ -149,10 +149,20 @@ components:
           type: integer
           minimum: 0
           maximum: 100
-        numberOfPreamblesSent:
-          type: integer
-          minimum: 0
-          maximum: 200
+        maxNumberOfPreamblesSent:
+          enum:
+            - n3
+            - n4
+            - n5
+            - n6
+            - n7
+            - n8
+            - n10
+            - n20
+            - n50
+            - n100
+            - n200
+
 
     UeAccDelayProbabilityDist:
       type: array
@@ -277,23 +287,9 @@ components:
         ipv6Address:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'
 
-    CellIndividualOffset:
-      type: object
-      properties:
-        rsrpOffsetSSB:
-          type: integer
-        rsrqOffsetSSB:
-          type: integer
-        sinrOffsetSSB:
-          type: integer
-        rsrpOffsetCSI-RS:
-          type: integer
-        rsrqOffsetCSI-RS:
-          type: integer
-        sinrOffsetCSI-RS:
-          type: integer
     QOffsetRange:
       type: integer
+      default: 0
       enum:
         - -24
         - -22
@@ -326,21 +322,6 @@ components:
         - 3
         - 2
         - 1
-    QOffsetRangeList:
-      type: object
-      properties:
-        rsrpOffsetSSB:
-          $ref: '#/components/schemas/QOffsetRange'
-        rsrqOffsetSSB:
-          $ref: '#/components/schemas/QOffsetRange'
-        sinrOffsetSSB:
-          $ref: '#/components/schemas/QOffsetRange'
-        rsrpOffsetCSI-RS:
-          $ref: '#/components/schemas/QOffsetRange'
-        rsrqOffsetCSI-RS:
-          $ref: '#/components/schemas/QOffsetRange'
-        sinrOffsetCSI-RS:
-          $ref: '#/components/schemas/QOffsetRange'
     QOffsetFreq:
       type: number
     TReselectionNRSf:
@@ -1085,7 +1066,11 @@ components:
                     nRTCI:
                       type: integer
                     cellIndividualOffset:
-                      $ref: '#/components/schemas/CellIndividualOffset'
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/QOffsetRange'
+                      minItems: 6
+                      maxItems: 6
                     adjacentNRCellRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     nRFrequencyRef:
@@ -1120,7 +1105,11 @@ components:
                   type: object
                   properties:
                     offsetMO:
-                      $ref: '#/components/schemas/QOffsetRangeList'
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/QOffsetRange'
+                      minItems: 6
+                      maxItems: 6  
                     blackListEntry:
                       type: array
                       items:
@@ -1183,7 +1172,11 @@ components:
               type: object
               properties:
                     cellIndividualOffset:
-                      $ref: '#/components/schemas/CellIndividualOffset'
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/QOffsetRange'
+                      minItems: 6
+                      maxItems: 6
                     blackListEntry:
                       type: array
                       items:
diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index f40b561c3b33d9c960f783ac9e66d7b2b2546285..176d1fd136febe750e2b220ff059adab31e60113 100644
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Generic NRM
-  version: 16.17.0
+  version: 16.18.0
   description: >-
     OAS 3.0.1 definition of the Generic NRM
     © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -1016,13 +1016,16 @@ components:
           items:
             type: string
             enum:
-              - M1
-              - M2
-              - M3
-              - M4
-              - M5
-              - M6
-              - M7
+              - M1_DL
+              - M2_DL
+              - M4_DL
+              - M4_UL
+              - M5_DL
+              - M5_UL
+              - M6_DL
+              - M6_UL
+              - M7_DL
+              - M7_UL
               - M1_EVENT_TRIGGERED
               - M8
               - M9