diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 71d6584f..7fd667eb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,13 +76,17 @@ jobs:
           update_check: true
           annotate_only: true
 
-      - uses: 5monkeys/cobertura-action@master
+      - uses: irongut/CodeCoverageSummary@v1.3.0
         with:
-          path: results/CodeCoverage/cobertura-coverage.xml
-          minimum_coverage: 80
-          show_line: true
-          show_branch: true
-          fail_below_threshold: false
+          filename: results/CodeCoverage/cobertura-coverage.xml
+          badge: true
+          format: markdown
+          hide_complexity: true
+          indicators: true
+          output: both
+
+      - run: |
+          cat code-coverage-results.md >> $GITHUB_STEP_SUMMARY
 
   run-local-integration-tests:
     name: Run Integration Tests for local runtime
diff --git a/mock.py b/mock.py
index f87d515c..9ed73977 100644
--- a/mock.py
+++ b/mock.py
@@ -16,11 +16,12 @@
 from lib.dsl import (
     create_animation_action,
     create_behavior,
+    create_event_trigger,
     create_set_action,
     get_datapoint_value,
     mock_datapoint,
 )
-from lib.trigger import ClockTrigger, EventTrigger, EventType
+from lib.trigger import ClockTrigger, EventType
 
 mock_datapoint(
     path="Vehicle.Speed",
@@ -42,7 +43,7 @@
     initial_value=0,
     behaviors=[
         create_behavior(
-            trigger=EventTrigger(EventType.ACTUATOR_TARGET),
+            trigger=create_event_trigger(EventType.ACTUATOR_TARGET),
             action=create_animation_action(
                 duration=10.0,
                 values=["$self", "$event.value"],
@@ -56,7 +57,7 @@
     initial_value="STOP_HOLD",
     behaviors=[
         create_behavior(
-            trigger=EventTrigger(EventType.ACTUATOR_TARGET),
+            trigger=create_event_trigger(EventType.ACTUATOR_TARGET),
             action=create_set_action("$event.value"),
         )
     ],
@@ -67,7 +68,7 @@
     initial_value=0,
     behaviors=[
         create_behavior(
-            trigger=EventTrigger(EventType.ACTUATOR_TARGET),
+            trigger=create_event_trigger(EventType.ACTUATOR_TARGET),
             action=create_set_action("$event.value"),
         )
     ],
@@ -78,7 +79,7 @@
     initial_value=0,
     behaviors=[
         create_behavior(
-            trigger=EventTrigger(EventType.ACTUATOR_TARGET),
+            trigger=create_event_trigger(EventType.ACTUATOR_TARGET),
             condition=lambda ctx: get_datapoint_value(
                 ctx, "Vehicle.Body.Windshield.Front.Wiping.System.Mode"
             )
@@ -86,7 +87,7 @@
             action=create_set_action(0),
         ),
         create_behavior(
-            trigger=EventTrigger(EventType.ACTUATOR_TARGET),
+            trigger=create_event_trigger(EventType.ACTUATOR_TARGET),
             condition=lambda ctx: get_datapoint_value(
                 ctx, "Vehicle.Body.Windshield.Front.Wiping.System.Mode"
             )
@@ -100,7 +101,7 @@
             ),
         ),
         create_behavior(
-            trigger=EventTrigger(EventType.ACTUATOR_TARGET),
+            trigger=create_event_trigger(EventType.ACTUATOR_TARGET),
             condition=lambda ctx: get_datapoint_value(
                 ctx, "Vehicle.Body.Windshield.Front.Wiping.System.Mode"
             )
@@ -121,7 +122,8 @@
     initial_value=False,
     behaviors=[
         create_behavior(
-            EventTrigger(EventType.ACTUATOR_TARGET), create_set_action("$event.value")
+            create_event_trigger(EventType.ACTUATOR_TARGET),
+            create_set_action("$event.value"),
         )
     ],
 )
diff --git a/runtime.json b/runtime.json
index 5ce38fee..c046ceca 100644
--- a/runtime.json
+++ b/runtime.json
@@ -177,7 +177,7 @@
         "config": [
             {
                 "key": "image",
-                "value": "ghcr.io/boschglobal/kuksa.val.services/mock_service:latest"
+                "value": "ghcr.io/eclipse-kuksa/kuksa-mock-provider/mock-provider:0.4.0"
             },
             {
                 "key": "env",
@@ -185,11 +185,11 @@
             },
             {
                 "key": "mount",
-                "value": "$pathInWorkspaceOrPackage( ${{ mockFilePath }} ):/mock.py"
+                "value": "$pathInWorkspaceOrPackage( ${{ mockFilePath }} ):/mock/mock.py"
             },
             {
                 "key": "start-pattern",
-                "value": ".*[cC]onnected to data broker.*"
+                "value": ".*Databroker connected!*"
             }
         ]
     }
diff --git a/runtime_kanto/src/runtime/deployment/mockservice.json b/runtime_kanto/src/runtime/deployment/mockservice.json
index 5ef35422..446311ce 100644
--- a/runtime_kanto/src/runtime/deployment/mockservice.json
+++ b/runtime_kanto/src/runtime/deployment/mockservice.json
@@ -1,11 +1,11 @@
 {
     "container_name": "mockservice",
     "image": {
-        "name": "ghcr.io/boschglobal/kuksa.val.services/mock_service:latest"
+        "name": "ghcr.io/eclipse-kuksa/kuksa-mock-provider/mock-provider:0.4.0"
     },
     "mount_points": [
         {
-            "destination": "mock.py",
+            "destination": "/mock/mock.py",
             "source": "/workspaces/vehicle-app-python-template/mock.py",
             "propagation_mode": "rprivate"
         }