diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 23ae0bec901ed12fdcd3f5e35a9417481169093c..ec4d20d03fb5b0492d458a3ef51f7264b4d4934e 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -606,19 +606,36 @@ components:
             type: integer
           minValue:
             type: integer
+
     NTNTAClist:
       type: array
       items:
         $ref: '#/components/schemas/NrTac'
+    
     Ephemeris:
       type: object
       oneOf:
-        - $ref: '#/components/schemas/PositionVelocity'
-        - $ref: '#/components/schemas/Orbital'
+        - required: [ positionVelocity ]
+        - required: [ orbital ]
+      required:
+        - satelliteId
+        - epochTime
       properties:
         satelliteId:
-          type: integer
-  
+          type: string
+          pattern: '^[0-9]{5}$'
+        epochTime:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+        positionVelocity:
+          $ref: '#/components/schemas/PositionVelocity'
+        orbital:
+          $ref: '#/components/schemas/Orbital'
+
+    EphemerisInfos:
+      type: array
+      items:
+        $ref: '#/components/schemas/Ephemeris'
+
     PositionVelocity:
       type: object
       properties:
@@ -933,6 +950,8 @@ components:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     dynamic5QISetRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+                    ephemerisInfoSetRef:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     dCHOControl:
                       type: boolean
                     dDAPSHOControl:
@@ -1976,7 +1995,7 @@ components:
                   $ref: '#/components/schemas/PlmnInfoList'
                 nTNTAClist:
                   $ref: '#/components/schemas/NrTacList'
-            EphemerisInfoSet:
+            ephemerisInfoSet:
               $ref: '#/components/schemas/EphemerisInfoSet-Multiple'
 
     EphemerisInfoSet-Single:
@@ -1988,20 +2007,8 @@ components:
               allOf:
                 - type: object
                   properties:
-                    EphemerisInfos:
-                      $ref: '#/components/schemas/Ephemeris-Multiple'
-
-    Ephemeris-Single:
-      allOf:
-              - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-              - type: object
-                oneOf:
-                  - $ref: '#/components/schemas/PositionVelocity'
-                  - $ref: '#/components/schemas/Orbital'
-                properties:
-                  satelliteId:
-                    type: integer
-
+                    ephemerisInfos:
+                      $ref: '#/components/schemas/EphemerisInfos'
 
 #-------- Definition of JSON arrays for name-contained IOCs ----------------------
 
@@ -2170,10 +2177,6 @@ components:
       items:
         $ref: '#/components/schemas/EphemerisInfoSet-Single'
 
-    Ephemeris-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/Ephemeris-Single'
 #-------- Definitions in TS 28.541 for TS 28.532 ---------------------------------
 
     resources-nrNrm:
@@ -2242,5 +2245,4 @@ components:
         - $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single'
         - $ref: '#/components/schemas/NTNFunction-Single'
         - $ref: '#/components/schemas/EphemerisInfoSet-Single'
-        - $ref: '#/components/schemas/Ephemeris-Single'