diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index 85edc5ba7f30f1e6bf161d9b6b81dc85c0e98cb9..477d234c51e5d3141605f4cf3f6a740dffc145e6 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -162,7 +162,55 @@ components:
               - $ref: '#/components/schemas/ResourceSharingLevelContext'
               - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context"
       required:
-        - expectationId                   
+        - expectationId
+    NetworkMaintenanceExpectation:
+      description: >-
+        This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for Network Maintenance
+      type: object
+      properties:
+        expectationId:
+          type: string
+        expectationVerb:
+          $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb"
+        expectationObjects:
+          type: array
+          uniqueItems: true 
+          items:
+            $ref: "#/components/schemas/NetworkMaintenanceExpectationObject"
+        expectationTargets:
+          type: array
+          uniqueItems: true 
+          items:
+            type: object
+            oneOf:
+              - $ref: '#/components/schemas/MaintenanceVersionTarget'
+              - $ref: '#/components/schemas/WeakRSRPRatioTarget'
+              - $ref: '#/components/schemas/LowSINRRatioTarget'
+              - $ref: '#/components/schemas/AveULRANUEThptTarget'
+              - $ref: '#/components/schemas/AveDLRANUEThptTarget'
+              - $ref: '#/components/schemas/LowULRANUEThptRatioTarget'
+              - $ref: '#/components/schemas/LowDLRANUEThptRatioTarget' 
+              - $ref: '#/components/schemas/HighULPrbLoadRatioTarget'
+              - $ref: '#/components/schemas/HighDLPrbLoadRatioTarget'
+              - $ref: '#/components/schemas/AveULPrbLoadTarget'
+              - $ref: '#/components/schemas/AveDLPrbLoadTarget'
+              - $ref: "#/components/schemas/RANEnergyConsumptionTarget"
+              - $ref: "#/components/schemas/RANEnergyEfficiencyTarget"
+              - $ref: "#/components/schemas/MaxNumberofPDUsessionsTarget"
+              - $ref: "#/components/schemas/MaxNumberofRegisteredsubscribersTarget"
+              - $ref: "#/components/schemas/IncomingDataTarget"
+              - $ref: "#/components/schemas/OutgoingDataTarget"
+              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget"
+        expectationContexts:
+          type: array
+          uniqueItems: true 
+          items:
+            type: object
+            oneOf:
+              - $ref: '#/components/schemas/MaintenanceTimeContext'
+              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context"
+      required:
+        - expectationId
    #-------Definition of the IntentExpectation dataType ----------#    
 
    #-------Definition of the scenario specific ExpectationObject dataType ----------#    
@@ -258,6 +306,34 @@ components:
               - $ref: "#/components/schemas/ServingScopeContext"
               - $ref: "#/components/schemas/DnnContext"
               - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context"
+    NetworkMaintenanceExpectationObject:
+      description: >-
+        This data type is the "ExpectationObject" data type with specialisations for NetworkMaintenanceExpectation
+      type: object
+      properties:
+        objectInstance:
+          $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn"
+        objectContexts:
+          type: array
+          uniqueItems: true 
+          items:
+            type: object
+            oneOf:
+              - $ref: "#/components/schemas/MaintenanceVersionContext"
+              - $ref: "#/components/schemas/MaintenanceOrderContext"
+              - $ref: "#/components/schemas/NfTypeContext"
+              - $ref: "#/components/schemas/NfInstanceLocationContext"
+              - $ref: "#/components/schemas/PLMNContext"
+              - $ref: "#/components/schemas/TaiContext"
+              - $ref: "#/components/schemas/ServingScopeContext"
+              - $ref: "#/components/schemas/DnnContext"
+              - $ref: '#/components/schemas/CoverageAreaPolygonContext'
+              - $ref: '#/components/schemas/CoverageTACContext'
+              - $ref: '#/components/schemas/PLMNContext'
+              - $ref: '#/components/schemas/DlFrequencyContext'
+              - $ref: '#/components/schemas/UlFrequencyContext'              
+              - $ref: '#/components/schemas/RATContext'
+              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context"
    #-------Definition of the ExpectationObject dataType ----------#    
 
 
@@ -851,6 +927,21 @@ components:
             - IS_LESS_THAN
         targetValueRange:
           type: integer
+    MaintenanceVersionTarget:
+      description: >-
+        This data type is the "ExpectationTarget" data type with specialisations for Maintenance Version Target. It describes the maintenance version target for the network maintenance, such as target version of the maintenance object after maintenance.
+      type: object
+      properties:
+        targetName:
+          type: string
+          enum:
+            - MaintenanceVersion
+        targetCondition:
+          type: string
+          enum:
+            - IS_EQUAL_TO
+        targetValueRange:
+          type: string
 
    #-------Definition of the concrete ExpectationTarget  dataType----------#  
    
@@ -1149,6 +1240,40 @@ components:
           uniqueItems: true
           items:
             type: string
+    MaintenanceVersionContext:
+      description: >-
+        This data type is the "ObjectContext" data type with specialisations for MaintenanceVersionContext. It describes the scope of the maintenance objects based on software version.
+      type: object
+      properties:
+        contextAttribute:
+          type: string
+          enum:
+            - swVersion
+        contextCondition:
+          type: string
+          enum:
+            - IS_ALL_OF
+        contextValueRange:
+          type: array
+          items:
+            type: string
+    MaintenanceOrderContext:
+      description: >-
+        This data type is the "ObjectContext" data type with specialisations for MaintenanceOrderContext. It describes describes the list of DNs for NFs/NEs based on their order for maintenance.
+      type: object
+      properties:
+        contextAttribute:
+          type: string
+          enum:
+            - maintenanceOrder
+        contextCondition:
+          type: string
+          enum:
+            - IS_ALL_OF
+        contextValueRange:
+          type: array
+          items:
+            type: string
    #-------Definition of the scenario specific  ObjectTarget dataType----------------#
    
    #-------Definition of the concrete ExpectationContext dataType----------------#
@@ -1295,4 +1420,19 @@ components:
             - IS_EQUAL_TO
         contextValueRange:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+    MaintenanceTimeContext:
+      description: >-
+        This data type is the "ExpectationContext" data type with specialisations for MaintenanceTimeContext
+      type: object
+      properties:
+        contextAttribute:
+          type: string
+          enum:
+            - MaintenanceTime
+        contextCondition:
+          type: string
+          enum:
+            - IS_EQUAL_TO
+        contextValueRange:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
    #-------Definition of the concrete ExpectionContext dataType----------------#
diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index 2048c8d88c1670c7c0fc3206da54a11faaf39705..ab7ff65145b10d35abe3ab721d94129e39dd26a3 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -43,6 +43,7 @@ components:
                 - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation"
                 - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation"
                 - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation"
+                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/NetworkMaintenanceExpectation"
           intentMgmtPurpose:
             $ref: "#/components/schemas/IntentMgmtPurpose"
           contextSelectivity:
@@ -173,7 +174,8 @@ components:
             - RAN_SUBNETWORK  #value for Radio Network Expectation--#
             - EDGE_SERVICE_SUPPORT  #value for Edge Service Support Expectation--#
             - 5GC_SUBNETWORK  #value for 5GC Network Expectation--#
-            - Radio_Service  #value for Radio Service Expectation--#            
+            - Radio_Service  #value for Radio Service Expectation--#
+            - SUBNETWORK  #value for Network Maintenance Expectation--#
         objectInstance:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
         objectContexts:
@@ -260,6 +262,7 @@ components:
       enum:
           - DELIVER
           - ENSURE
+          - MAINTAIN
       description: It describes the characteristic of the intentExpectation and is the property that describes the types of intentExpectations. Vendor extensions are allowed    
     Frequency:
       description: >-