diff --git a/classes/event/process_proceeded.php b/classes/event/process_proceeded.php
index 5aada6de..0e6149ff 100644
--- a/classes/event/process_proceeded.php
+++ b/classes/event/process_proceeded.php
@@ -35,7 +35,6 @@
  *      - int processid: the id of the process.
  *      - int workflowid: the id of the workflow.
  *      - int stepindex: the index of the step.
- *      - int courseid: the id of the course.
  * }
  *
  * @package    tool_lifecycle
@@ -54,12 +53,12 @@ class process_proceeded extends \core\event\base {
      */
     public static function event_from_process($process) {
         $data = [
-                'context' => \context_system::instance(),
+                'context' => \context_course::instance($process->courseid),
+                'courseid' => $process->courseid,
                 'other' => [
                         'processid' => $process->id,
                         'workflowid' => $process->workflowid,
                         'stepindex' => $process->stepindex,
-                        'courseid' => $process->courseid,
                 ],
         ];
         return self::create($data);
@@ -84,7 +83,7 @@ public function get_description() {
         $processid = $this->other['processid'];
         $workflowid = $this->other['workflowid'];
         $stepindex = $this->other['stepindex'];
-        $courseid = $this->other['courseid'];
+        $courseid = $this->courseid;
 
         return "The workflow with id '$workflowid' finished step '$stepindex' successfully for course '$courseid' " .
                 "in the process with id '$processid'";
@@ -130,7 +129,7 @@ protected function validate_data() {
             throw new \coding_exception('The \'stepindex\' value must be set');
         }
 
-        if (!isset($this->other['courseid'])) {
+        if (!isset($this->courseid)) {
             throw new \coding_exception('The \'courseid\' value must be set');
         }
     }
diff --git a/classes/event/process_rollback.php b/classes/event/process_rollback.php
index cafc1031..93eb3f7e 100644
--- a/classes/event/process_rollback.php
+++ b/classes/event/process_rollback.php
@@ -54,12 +54,12 @@ class process_rollback extends \core\event\base {
      */
     public static function event_from_process($process) {
         $data = [
-                'context' => \context_system::instance(),
+                'context' => \context_course::instance($process->courseid),
+                'courseid' => $process->courseid,
                 'other' => [
-                    'processid' => $process->id,
-                    'workflowid' => $process->workflowid,
-                    'stepindex' => $process->stepindex,
-                    'courseid' => $process->courseid,
+                        'processid' => $process->id,
+                        'workflowid' => $process->workflowid,
+                        'stepindex' => $process->stepindex,
                 ],
         ];
         return self::create($data);
@@ -84,7 +84,7 @@ public function get_description() {
         $processid = $this->other['processid'];
         $workflowid = $this->other['workflowid'];
         $stepindex = $this->other['stepindex'];
-        $courseid = $this->other['courseid'];
+        $courseid = $this->courseid;
 
         return "The workflow with id '$workflowid' was rolled back on step '$stepindex' for course '$courseid' " .
                 "in the process with id '$processid'";
@@ -130,7 +130,7 @@ protected function validate_data() {
             throw new \coding_exception('The \'stepindex\' value must be set');
         }
 
-        if (!isset($this->other['courseid'])) {
+        if (!isset($this->courseid)) {
             throw new \coding_exception('The \'courseid\' value must be set');
         }
     }
diff --git a/classes/event/process_triggered.php b/classes/event/process_triggered.php
index a71507ad..aa27c47a 100644
--- a/classes/event/process_triggered.php
+++ b/classes/event/process_triggered.php
@@ -53,11 +53,11 @@ class process_triggered extends \core\event\base {
      */
     public static function event_from_process($process) {
         $data = [
-                'context' => \context_system::instance(),
+                'context' => \context_course::instance($process->courseid),
+                'courseid' => $process->courseid,
                 'other' => [
                         'processid' => $process->id,
                         'workflowid' => $process->workflowid,
-                        'courseid' => $process->courseid,
                 ],
         ];
         return self::create($data);
@@ -81,7 +81,7 @@ protected function init() {
     public function get_description() {
         $processid = $this->other['processid'];
         $workflowid = $this->other['workflowid'];
-        $courseid = $this->other['courseid'];
+        $courseid = $this->courseid;
 
         return "The workflow with id '$workflowid' triggered for course '$courseid' and created process with id '$processid'";
     }
@@ -122,7 +122,7 @@ protected function validate_data() {
             throw new \coding_exception('The \'workflowid\' value must be set');
         }
 
-        if (!isset($this->other['courseid'])) {
+        if (!isset($this->courseid)) {
             throw new \coding_exception('The \'courseid\' value must be set');
         }
     }