diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn
index 5684a1a0465e209a449cc09b5811728c5610ced1..8d0c773aa73cb2172eadcbfe9e10d04d1a239870 100644
--- a/33128/r18/TS33128Payloads.asn
+++ b/33128/r18/TS33128Payloads.asn
@@ -251,7 +251,14 @@ XIRIEvent ::= CHOICE
     ePSRANHandoverCommand                               [148] EPSRANHandoverCommand,
     ePSRANHandoverRequest                               [149] EPSRANHandoverRequest,
     mMERANTraceReport                                   [150] MMERANTraceReport,
-    mMEUEServiceAccept                                  [151] MMEUEServiceAccept
+    mMEUEServiceAccept                                  [151] MMEUEServiceAccept,
+
+    --NWDAF events, see clause 7.X.2
+    nWDAFEventsSubscription                             [152] NWDAFEventsSubscription,
+    nWDAFEventNotification                              [153] NWDAFEventNotification,
+    nWDAFAnalyticsInfoQuery                             [154] NWDAFAnalyticsInfoQuery,
+    nWDAFRoamingAnalyticsSubscription                   [155] NWDAFRoamingAnalyticsSubscription,
+    nWDAFRoamingAnalyticsNotification                   [156] NWDAFRoamingAnalyticsNotification
 }
 
 -- ==============
@@ -495,7 +502,14 @@ IRIEvent ::= CHOICE
     ePSRANHandoverCommand                               [148] EPSRANHandoverCommand,
     ePSRANHandoverRequest                               [149] EPSRANHandoverRequest,
     mMERANTraceReport                                   [150] MMERANTraceReport,
-    mMEUEServiceAccept                                  [151] MMEUEServiceAccept
+    mMEUEServiceAccept                                  [151] MMEUEServiceAccept,
+
+    --NWDAF events, see clause 7.X.3
+    nWDAFEventsSubscription                             [152] NWDAFEventsSubscription,
+    nWDAFEventNotification                              [153] NWDAFEventNotification,
+    nWDAFAnalyticsInfoQuery                             [154] NWDAFAnalyticsInfoQuery,
+    nWDAFRoamingAnalyticsSubscription                   [155] NWDAFRoamingAnalyticsSubscription,
+    nWDAFRoamingAnalyticsNotification                   [156] NWDAFRoamingAnalyticsNotification
 }
 
 IRITargetIdentifier ::= SEQUENCE
@@ -4994,6 +5008,130 @@ FiveGMSAFErrorCode ::=ENUMERATED
     unsupportedMediaType415(4)
 }
 
+-- =================
+-- NWDAF definitions
+-- =================
+
+NWDAFEventsSubscription ::=SEQUENCE
+{
+    sUPI                                [1] SUPI,
+    nWDAFConsumerNFType                 [2] NWDAFConsumerNFType,
+    nWDAFEventsSubscriptionOpType       [3] NWDAFEventsSubscriptionOpType,
+    nWDAFSubscribedEventList            [4] SET OF NWDAFEvent OPTIONAL,
+    nWDAFEventsSubscription             [5] SBIType OPTIONAL,
+    nWDAFEventsSubscriptionID           [6] UTF8String OPTIONAL,
+    nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode
+}
+
+NWDAFEventNotification ::=SEQUENCE
+{
+    sUPI                        [1] SUPI,
+    nWDAFNotifiedEvent          [2] NWDAFEvent,
+    nWDAFEventNotification      [3] SBIType
+}
+
+NWDAFAnalyticsInfoQuery ::=SEQUENCE
+{
+    sUPI                           [1] SUPI,
+    nWDAFEvent                     [2] NWDAFEvent,
+    nWDAFEventReportingRequirement [3] SBIType OPTIONAL,
+    nWDAFEventFilter               [4] SBIType OPTIONAL,
+    nWDAFAnalyticsData             [5] SBIType OPTIONAL,
+    nWDAFAnalyticsInfoResponseCode [6] NWDAFAnalyticsInfoResponseCode
+}
+
+NWDAFRoamingAnalyticsSubscription ::=SEQUENCE
+{
+    sUPI                                [1] SUPI,
+    pLMNID                              [2] PLMNID,
+    nWDAFEventsSubscriptionOpType       [3] NWDAFEventsSubscriptionOpType,
+    nWDAFSubscribedEventList            [4] SET OF NWDAFEvent OPTIONAL,
+    nWDAFEventsSubscription             [5] SBIType OPTIONAL,
+    nWDAFEventsSubscriptionID           [6] UTF8String OPTIONAL,
+    nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode
+}
+
+NWDAFRoamingAnalyticsNotification ::=SEQUENCE
+{
+    sUPI                      [1] SUPI,
+    nWDAFNotifiedEvent        [2] NWDAFEvent,
+    nWDAFEventNotification    [3] SBIType
+}
+
+-- ==============
+-- NWDAF parameters
+-- ==============
+
+NWDAFEventsSubscriptionOpType ::= ENUMERATED
+{
+    pOST(1),
+    pUT(2),
+    dELETE(3)
+}
+
+NWDAFEventsSubscriptionResponseCode ::= ENUMERATED
+{
+    oK200(1),
+    created201(2),
+    noContent204(3),
+    temporaryRedirect307(4),
+    permanentRedirect308(5),
+    badRequest400(6),
+    unauthorized401(7),
+    forbidden403(8),
+    notFound404(9),
+    notAcceptable406(10),
+    lengthRequired411(11),
+    payloadTooLarge413(12),
+    unsupportedMediaType415(13),
+    tooManyRequests429(14),
+    internalServerError500(15),
+    notImplemented501(16),
+    badGateway502(17),
+    serviceUnavailable503(18)
+}
+
+NWDAFAnalyticsInfoResponseCode ::= ENUMERATED
+{
+    oK200(1),
+    noContent204(2),
+    badRequest400(3),
+    unauthorized401(4),
+    forbidden403(5),
+    notFound404(6),
+    notAcceptable406(7),
+    uRITooLong414(8),
+    tooManyRequests429(9),
+    internalServerError500(10),
+    badGateway502(11),
+    serviceUnavailable503(12)
+}
+
+NWDAFConsumerNFType ::= ENUMERATED
+{
+    pCF(1),
+    nSSF(2),
+    aMF(3),
+    sMF(4),
+    nEF(5),
+    aF(6),
+    lMF(7),
+    oAM(8),
+    nWDAF(9),
+    dCCF(10),
+    cEF(11)
+}
+
+NWDAFEvent ::= ENUMERATED
+{
+    serviceExperience(1),
+    uEMobility(2),
+    uEComm(3),
+    abnormalBehaviour(4),
+    dispersion(5),
+    relativeProximity(6),
+    pDUSessionTraffic(7)
+}
 
 -- ===================
 -- 5G LALS definitions