diff --git a/core/environment/environment.go b/core/environment/environment.go
index a6b32038..15b39f72 100644
--- a/core/environment/environment.go
+++ b/core/environment/environment.go
@@ -194,24 +194,6 @@ func newEnvironment(userVars map[string]string) (env *Environment, err error) {
 					} else {
 						log.Error("cannot access AliECS workflow configuration defaults")
 					}
-				} else if e.Event == "STOP_ACTIVITY" {
-					endTime, ok := env.workflow.GetUserVars().Get("run_end_time_ms")
-					if ok && endTime == "" {
-						runEndTime := strconv.FormatInt(time.Now().UnixMilli(), 10)
-						env.workflow.SetRuntimeVar("run_end_time_ms", runEndTime)
-					} else {
-						log.WithField("partition", envId.String()).
-							Debug("O2 End time already set before before_STOP_ACTIVITY")
-					}
-				} else if e.Event == "GO_ERROR" {
-					endTime, ok := env.workflow.GetUserVars().Get("run_end_time_ms")
-					if ok && endTime == "" {
-						runEndTime := strconv.FormatInt(time.Now().UnixMilli(), 10)
-						env.workflow.SetRuntimeVar("run_end_time_ms", runEndTime)
-					} else {
-						log.WithField("partition", envId.String()).
-							Debug("O2 End time already set before before_GO_ERROR")
-					}
 				}
 
 				if rn := env.GetCurrentRunNumber(); rn != 0 {
@@ -231,6 +213,17 @@ func newEnvironment(userVars map[string]string) (env *Environment, err error) {
 				if errHooks != nil {
 					e.Cancel(errHooks)
 				}
+
+				if e.Event == "STOP_ACTIVITY" {
+					endTime, ok := env.workflow.GetUserVars().Get("run_end_time_ms")
+					if ok && endTime == "" {
+						runEndTime := strconv.FormatInt(time.Now().UnixMilli(), 10)
+						env.workflow.SetRuntimeVar("run_end_time_ms", runEndTime)
+					} else {
+						log.WithField("partition", envId.String()).
+							Debug("O2 End time already set before before_STOP_ACTIVITY")
+					}
+				}
 			},
 			"leave_state": func(_ context.Context, e *fsm.Event) {
 				errHooks := env.handleHooks(env.Workflow(), fmt.Sprintf("leave_%s", e.Src))
@@ -261,6 +254,19 @@ func newEnvironment(userVars map[string]string) (env *Environment, err error) {
 			"after_event": func(_ context.Context, e *fsm.Event) {
 				defer func() { env.currentTransition = "" }()
 
+				// we set the run end time after all the transition is complete to allow trigger to finish first,
+				// which is a requirement from PDP (SOR < SOX < EOX < EOR)
+				if e.Event == "GO_ERROR" {
+					endTime, ok := env.workflow.GetUserVars().Get("run_end_time_ms")
+					if ok && endTime == "" {
+						runEndTime := strconv.FormatInt(time.Now().UnixMilli(), 10)
+						env.workflow.SetRuntimeVar("run_end_time_ms", runEndTime)
+					} else {
+						log.WithField("partition", envId.String()).
+							Debug("O2 End time already set before after_GO_ERROR")
+					}
+				}
+
 				errHooks := env.handleHooks(env.Workflow(), fmt.Sprintf("after_%s", e.Event))
 				if errHooks != nil {
 					e.Cancel(errHooks)
@@ -303,6 +309,7 @@ func newEnvironment(userVars map[string]string) (env *Environment, err error) {
 					env.currentRunNumber = 0
 					env.workflow.GetVars().Del("run_number")
 					env.workflow.GetVars().Del("runNumber")
+
 					// Ensure the auto stop timer is stopped (important for stop transitions NOT triggered by the timer itself)
 					env.invalidateAutoStopTransition()
 				}
diff --git a/core/integration/ccdb/plugin.go b/core/integration/ccdb/plugin.go
index 06322b94..4fa01e9f 100644
--- a/core/integration/ccdb/plugin.go
+++ b/core/integration/ccdb/plugin.go
@@ -455,6 +455,21 @@ func (p *Plugin) CallStack(data interface{}) (stack map[string]interface{}) {
 				Debug("probably went to ERROR while not in RUNNING, doing nothing")
 			return
 		}
+
+		trgEndTimeMsUint, _ := strconv.ParseUint(grp.trgEndTimeMs, 10, 32)
+		o2EndTimeMsUint, _ := strconv.ParseUint(grp.runEndTimeMs, 10, 32)
+		if trgEndTimeMsUint == 0 {
+			log.WithField("call", "RunStop").
+				WithField("partition", envId).
+				WithField("level", infologger.IL_Ops).
+				Error("End of trigger time will be missing in the CCDB GRPECS. Please create a log entry in BK and tag PDP")
+		}
+		if trgEndTimeMsUint > o2EndTimeMsUint {
+			log.WithField("call", "RunStop").
+				WithField("partition", envId).
+				WithField("level", infologger.IL_Ops).
+				Errorf("End of trigger time will be later than end of run time (%d > %d) in the CCDB GRPECS. Please create a log entry in BK and tag PDP", trgEndTimeMsUint, o2EndTimeMsUint)
+		}
 		_, runExists := p.existingRuns[grp.runNumber]
 		if runExists {
 			delete(p.existingRuns, grp.runNumber)