diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 5cd7a37ab17f346aca9dea07772f384e58a0c551..8fcebeda6d8dc01c89b388e6b36677c6a542ebff 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -319,6 +319,10 @@ components:
       - type: array
         items:
           $ref: '#/components/schemas/Tai'
+      - type: array
+        items:
+          $ref: '#/components/schemas/NpnId-Type'
+
     Tai:
       type: object
       properties:
@@ -412,6 +416,20 @@ components:
                 type: integer
                 minimum: 0
                 maximum: 31
+    NpnId-Type:
+      type: object
+      description: This describes the PLMN id, CAG ID list or the NID of the SNPN within the PLMN.
+      properties:
+        plmnId:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
+        cAGIdList:
+          type: array
+          items:
+            type: string
+        nIDList:
+          type: array
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Nid'
 
 #-------- Definition of abstract IOC Top -----------------------------------------
 
diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml
index 97ad48131fdecf335bc535435d524c1391f54957..340072563d03f6b6c931bc4486b9394fd5564ecd 100644
--- a/OpenAPI/TS28623_TraceControlNrm.yaml
+++ b/OpenAPI/TS28623_TraceControlNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Trace Control NRM
-  version: 18.4.0
+  version: 18.5.0
   description: >-
     OAS 3.0.1 definition of the Trace Control NRM fragment
     © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -1342,6 +1342,10 @@ components:
           $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type'
         areaConfigurationForNeighCell:
           $ref: '#/components/schemas/AreaConfig'
+        nPNIdentityList:
+          type: array
+          items:
+            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type'
 
     mdtConfig-Type:
       description: MDT config parameters. See details in 3GPP TS 28.622 clause 4.3.30.
@@ -1373,6 +1377,9 @@ components:
       - type: array
         items:
           $ref: '#/components/schemas/Tai'
+      - type: array
+        items:
+          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type'
     Tai:
       type: object
       properties:
@@ -1419,6 +1426,8 @@ components:
           $ref: '#/components/schemas/jobType-Type'
         plmnTarget:
           $ref: '#/components/schemas/plmnTarget-Type'
+        nPNTarget:
+          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type'
         traceReportingConsumerUri:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
         traceCollectionEntityIpAddress: