diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 34db1437a12b3b2c6412791935708a1807a5ba02..18e0827c0a4d95333cf8efa3bb69586eb575238e 100644
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: 3GPP 5GC NRM
-  version: 16.16.0
+  version: 16.18.0
   description: >-
     OAS 3.0.1 specification of the 5GC NRM
     © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -264,7 +264,8 @@ components:
           type: string
           enum:
             - GBR
-            - NonGBR
+            - NON_GBR
+            - DELAY_CRITICAL_GBR
         priorityLevel:
           type: integer
         packetDelayBudget:
@@ -909,8 +910,8 @@ components:
                       type: string
                     cNSIIdList:
                       $ref: '#/components/schemas/CNSIIdList'
-                    nFProfileList:
-                      $ref: '#/components/schemas/NFProfileList'
+                    managedNFProfile:
+                      $ref: '#/components/schemas/ManagedNFProfile'
                     snssaiList:
                       $ref: '#/components/schemas/SnssaiList'
                     commModelList:
@@ -922,6 +923,8 @@ components:
               $ref: '#/components/schemas/EP_N22-Multiple'
             EP_N31:
               $ref: '#/components/schemas/EP_N31-Multiple'
+            EP_N34:
+              $ref: '#/components/schemas/EP_N34-Multiple'              
     SmsfFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1038,6 +1041,11 @@ components:
                       $ref: '#/components/schemas/ManagedNFProfile'
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - type: object
+          properties:
+            EP_N34:
+              $ref: '#/components/schemas/EP_N34-Multiple'
     ScpFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1468,7 +1476,20 @@ components:
                       type: string
                     withIPX:
                       type: boolean
-
+    EP_N34-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              allOf:
+                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - type: object
+                  properties:
+                    localAddress:
+                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
+                    remoteAddress:
+                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
     EP_S5C-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1888,7 +1909,10 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/EP_N32-Single'
-
+    EP_N34-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/EP_N34-Single'
     EP_S5C-Multiple:
       type: array
       items:
@@ -1986,7 +2010,8 @@ components:
        - $ref: '#/components/schemas/EP_N27-Single'
 
        - $ref: '#/components/schemas/EP_N31-Single'
-       - $ref: '#/components/schemas/EP_N31-Single'
+       - $ref: '#/components/schemas/EP_N32-Single'
+       - $ref: '#/components/schemas/EP_N34-Single'
 
        - $ref: '#/components/schemas/EP_S5C-Single'
        - $ref: '#/components/schemas/EP_S5U-Single'
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index ada6f6366a9c3d07f287a0654fc21d33d5afa33b..329e298eefc2692f57efd38e075dd1fb4f28af2b 100644
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: NR NRM
-  version: 16.16.0
+  version: 16.18.0
   description: >-
     OAS 3.0.1 specification of the NR NRM
     © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -43,6 +43,7 @@ components:
           $ref: '#/components/schemas/Sst'
         sd:
           type: string
+          pattern: '^[A-Fa-f0-9]{6}$'
 
     PlmnIdList:
       type: array
@@ -1290,7 +1291,7 @@ components:
                       $ref: "#/components/schemas/UeAccProbabilityDist"
                     ueAccDelayProbabilityDist:
                       $ref: "#/components/schemas/UeAccDelayProbabilityDist"
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+
 
     DMROFunction-Single:
       allOf:
diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml
index 368a6b27c73a6a09ac0f305f933b89bc385a23a8..c7ce3d3a138b84d0e25917597818c5d96ac47928 100644
--- a/OpenAPI/TS28541_SliceNrm.yaml
+++ b/OpenAPI/TS28541_SliceNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Slice NRM
-  version: 16.16.0
+  version: 16.17.0
   description: >-
     OAS 3.0.1 specification of the Slice NRM
     @ 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 3581a4169db5f01e5e3df14800086331c79ba4cf..3a8530a5d1ba30e15dd982ee725df4d52c3fd5cf 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.15.0
+  version: 16.16.0
   description: >-
     OAS 3.0.1 definition of the Generic NRM
     © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -540,6 +540,7 @@ components:
               - S5-C
               - N16
               - N16a
+              - N38
         SMSFInterfaces:
           type: array
           items: