diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index fe2d5d5c165165ba028583f05db8c36d9007818b..c535dc0409a664dbc6a419c918167c07831e30c7 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -3789,7 +3789,12 @@ components:
                       type: array
                       uniqueItems: true
                       items:
-                        $ref: '#/components/schemas/UpfInfo'    
+                        $ref: '#/components/schemas/UpfInfo'
+                    isOnboardSatellite:
+                      type: boolean
+                    onboardSatelliteId:
+                      type: string
+                      pattern: '^[0-9]{5}$' 
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 93a21737afee65c49ff9136438267f8b7c77e900..8023f597597eb206dd67b948dd2a73dccfb1374d 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -49,6 +49,10 @@ components:
           type: string
           pattern: '^[A-Fa-f0-9]{6}$'
 
+    SatelliteId:
+      type: string
+      pattern: '^[0-9]{5}$'
+
     PlmnIdList:
       type: array
       uniqueItems: true
@@ -622,8 +626,7 @@ components:
         - epochTime
       properties:
         satelliteId:
-          type: string
-          pattern: '^[0-9]{5}$'
+          $ref: '#/components/schemas/SatelliteId'
         epochTime:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
         positionVelocity:
@@ -853,6 +856,10 @@ components:
                       $ref: '#/components/schemas/GnbId'
                     gnbIdLength:
                       $ref: '#/components/schemas/GnbIdLength'
+                    isOnboardSatellite:
+                      type: boolean
+                    onboardSatelliteId:
+                      $ref: '#/components/schemas/SatelliteId'
                     rimRSReportConf:
                       $ref: '#/components/schemas/RimRSReportConf'
                     configurable5QISetRef:
@@ -924,6 +931,10 @@ components:
                       $ref: '#/components/schemas/GnbIdLength'
                     gnbCuUpId:
                       $ref: '#/components/schemas/GnbCuUpId'
+                    isOnboardSatellite:
+                      type: boolean
+                    onboardSatelliteId:
+                      $ref: '#/components/schemas/SatelliteId'
                     plmnInfoList:
                       $ref: '#/components/schemas/PlmnInfoList'
                     configurable5QISetRef:
@@ -988,6 +999,10 @@ components:
                       items:
                         $ref: '#/components/schemas/MappingSetIDBackhaulAddress'
                       minItems: 1
+                    isOnboardSatellite:
+                      type: boolean
+                    onboardSatelliteId:
+                      $ref: '#/components/schemas/SatelliteId'
                     tceIDMappingInfoList:
                       $ref: '#/components/schemas/TceIDMappingInfoList'
                     configurable5QISetRef: