diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 1e8c8c0f494d486f78c286d67aaeb55f03c72f45..34db1437a12b3b2c6412791935708a1807a5ba02 100644
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -126,7 +126,7 @@ components:
     TACList:
       type: array
       items:
-        $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTac'
+        $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'
     WeightFactor:
       type: integer
     UdmInfo:
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index c753fd44ecb11cc95cc9ddaba202b3ccc16728a2..f7d67db264b1c363a75193f54fadde70016f4ed6 100644
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -79,16 +79,6 @@ components:
     NrPci:
       type: integer
       maximum: 503
-    NrTac:
-      type: integer
-      maximum: 16777215
-    Tai:
-      type: object
-      properties:
-        plmnId:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
-        nrTac:
-          $ref: '#/components/schemas/NrTac'
 
     BackhaulAddress:
       type: object
@@ -96,7 +86,7 @@ components:
         gnbId:
           $ref: '#/components/schemas/GnbId'
         tai:
-          $ref: "#/components/schemas/Tai"
+          $ref: "TS28623_GenericNrm.yaml#/components/schemas/Tai"
     MappingSetIDBackhaulAddress:
       type: object
       properties:
@@ -847,7 +837,7 @@ components:
                     nrPci:
                       $ref: '#/components/schemas/NrPci'
                     nrTac:
-                      $ref: '#/components/schemas/NrTac'
+                      $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'
                     arfcnDL:
                       type: integer
                     arfcnUL: