diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 3475d0cbc1ada4a32c884d83224e07a4ae6ad71d..f4809ba71fc2a28b5aaa8f597c6aee5e541bd494 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -74,11 +74,23 @@ components:
       items:
         $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type'
     GGnbId:
-        type: string
-        pattern: '^[0-9]{3}[0-9]{2,3}-(22|23|24|25|26|27|28|29|30|31|32)-[0-9]{1,10}'
+      type: object
+      properties:
+        plmnId:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
+        gnbIdLength:
+          $ref: '#/components/schemas/GnbIdLength'
+        gnbId:
+          $ref: '#/components/schemas/GnbId'
     GEnbId:
-        type: string
-        pattern: '^[0-9]{3}[0-9]{2,3}-(18|20|21|22)-[0-9]{1,7}'
+      type: object
+      properties:
+        plmnId:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
+        enbId:
+          type: integer
+          minimum: 0
+          maximum: 4194303
 
     GGnbIdList:
         type: array