diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 5fe4522ff4a25e39da3cb99a3b1f0810ca58486f..b298b5e57b9eea0a8e3faa6665cf240b4386b8af 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -692,8 +692,7 @@ components:
       type: object
       properties:
         uPFIpAddress:
-          type: string
-          readOnly: true
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostRo'
         uPFRef:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
     SnssaiList:
@@ -3956,11 +3955,11 @@ components:
                     eDNServiceArea:
                       $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/ServingLocation'
                     eASIpAddress:
-                      type: string
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr'
                     eESIpAddress:
-                      type: string
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr'
                     eCSIpAddress:
-                      type: string
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr'
                     ednIdentifier:
                       type: string
                     ecmConnectionType:
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 3aea8f9c8fe1cef764d495848f45351f8cb79780..0c3c8831f99996e3d9855b865fa29d67bfeaafd7 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -282,10 +282,8 @@ components:
     AddressWithVlan:
       type: object
       properties:
-        ipv4Address:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr'
-        ipv6Address:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'
+        iPAddress:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr'
         vlanId:
           type: integer
           minimum: 0
@@ -300,12 +298,7 @@ components:
           minimum: 0
           maximum: 65535
     RemoteAddress:
-      type: object
-      properties:
-        ipv4Address:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr'
-        ipv6Address:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'
+      $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr'
 
     CellIndividualOffset:
       type: object
@@ -579,13 +572,11 @@ components:
     TceMappingInfo:
       type: object
       properties:
-        TceIPAddress:
-          oneOf:
-            - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr'
-            - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'
-        TceID:
+        tceIPAddress:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr'
+        tceID:
           type: integer
-        PlmnTarget:
+        pLMNTarget:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
     TceMappingInfoList:
       type: array
diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml
index ff303617cc6b5653408e8a361c90be9b6d72fbab..962116a9b0e9a661072f06be9a704b1862d4cfb3 100755
--- a/OpenAPI/TS28623_ComDefs.yaml
+++ b/OpenAPI/TS28623_ComDefs.yaml
@@ -281,6 +281,10 @@ components:
       oneOf:
         - $ref: '#/components/schemas/IpAddr'
         - $ref: '#/components/schemas/Fqdn'
+    HostRo:
+      oneOf:
+        - $ref: '#/components/schemas/IpAddrRo'
+        - $ref: '#/components/schemas/FqdnRo'
     Uri:
       description: This datatype is used for writable attribute
       type: string