diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
index b7c05dddd58335b1b023c44faee40419bd14c778..fc2bca3007c89f085e6ef9c60e3b55b1df288807 100755
--- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
@@ -20,6 +20,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-05-07 { reference "CR-1548"; }
   revision 2025-01-25 { reference "CR-1442"; }
   revision 2024-11-07 { reference "CR-1443"; } 
   revision 2024-08-19 { reference "CR-1405"; } 
@@ -294,7 +295,22 @@ module _3gpp-nr-nrm-gnbcucpfunction {
       description "DN of the Configurable5QISet that the GNBCUCPFunction 
         supports (is associated to).";
     }
-
+    
+    leaf isOnboardSatellite {
+      type boolean;
+      default false;
+      description "This attribute indicates whether the function is
+       on board the satellite.";
+    }
+    
+    leaf onboardSatelliteId {
+      type string;
+      config false;
+      description "This attribute indicates the onboard satellite Id. 
+      It shall be formatted as a fixed 5-digit string, padding with
+      leading digits '0' to complete a 5-digit length.";
+    }
+    
     leaf dynamic5QISetRef {
       type types3gpp:DistinguishedName;
       description "DN of the Dynamic5QISet that the GNBCUCPFunction supports 
@@ -349,7 +365,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
 
     leaf gnbIdLength {
       type int32 {range "22..32";}
-		  mandatory true;
+      mandatory true;
       description "This indicates the number of bits for encoding the gNB ID. 
       See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
     }
diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang
index 4932b44d8b0431f4666e530f364860991cab6ac8..3b879eb7f05462062a1c2c6d9dcba4d6a1e90fe6 100755
--- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang
@@ -18,6 +18,7 @@ module _3gpp-nr-nrm-gnbdufunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-05-07 { reference CR-1548; }
   revision 2025-02-05 { reference CR-1441; }
   revision 2024-02-24 { reference CR-1218; } 
   revision 2023-09-18 { reference CR-1043 ; } 
@@ -122,6 +123,21 @@ module _3gpp-nr-nrm-gnbdufunction {
         a single report.";
     }
 
+    leaf isOnboardSatellite {
+      type boolean;
+      mandatory false;
+      default false;
+      description "This attribute indicates whether the function is 
+      on board the satellite.";
+    }
+    
+    leaf onboardSatelliteId {
+      type string;
+      description "This attribute indicates the onboard satellite Id. 
+      It shall be formatted as a fixed 5-digit string, padding with
+      leading digits “0” to complete a 5-digit length.";
+    }
+
     leaf maxPropagationDelay {
       type uint32 {
         range "0..327679";