diff --git a/configurations/system/tests_cases/ks_microservice_test.py b/configurations/system/tests_cases/ks_microservice_test.py
index 0cf7cca6..52109c57 100644
--- a/configurations/system/tests_cases/ks_microservice_test.py
+++ b/configurations/system/tests_cases/ks_microservice_test.py
@@ -58,7 +58,7 @@ def ac_5_fix_control_no_relevancy():
         )
 
     @staticmethod
-    def ac_alpine_fix_image_with_relevancy():
+    def ac_alpine_workload_external_track_fix_image():
         """
         install scenario 'alpine' on the cluster, install the kubescape operator and run the scan.
         once the attack chain has been detected on the backend, fix the attack chain and verify that is has been solved 
@@ -74,7 +74,7 @@ def ac_alpine_fix_image_with_relevancy():
         )
 
     @staticmethod
-    def ac_alpine_fix_image_with_relevancy_with_cronjob():
+    def ac_alpine_workload_external_track_fix_image_with_cronjob():
         """
         install scenario 'alpine' on the cluster, install the kubescape operator and run the scan triggered by a cronjob.
         once the attack chain has been detected on the backend, fix the attack chain and verify that is has been solved 
@@ -90,7 +90,7 @@ def ac_alpine_fix_image_with_relevancy_with_cronjob():
         )
 
     @staticmethod
-    def ac_alpine_fix_control_with_relevancy():
+    def ac_alpine_workload_external_track_fix_control():
         """
         install scenario 'alpine' on the cluster, install the kubescape operator and run the scan.
         once the attack chain has been detected on the backend, fix the attack chain and verify that is has been solved 
@@ -246,7 +246,7 @@ def ac_3_fix_control_no_relevancy():
         )
     
     @staticmethod
-    def ac_8_fix_control_with_relevancy():
+    def ac_8_external_workload_with_cluster_takeover():
         """
         install scenario #8 on the cluster, install the kubescape operator and run the scan.
         once the attack chain has been detected on the backend, fix the attack chain and verify that is has been solved 
diff --git a/readme.md b/readme.md
index b61f6526..3f6aef00 100644
--- a/readme.md
+++ b/readme.md
@@ -65,12 +65,12 @@ Please ensure all these details are accurately filled to maintain the effectiven
 | `ac_5_fix_control_with_relevancy`                | helm-chart |                                    | in-cluster kubescape, backend |
 | `ac_3_fix_control_no_relevancy`                | helm-chart |                                    | in-cluster kubescape, backend |
 | `ac_3_fix_control_with_relevancy`                | helm-chart |                                    | in-cluster kubescape, backend |
-| `ac_8_fix_control_with_relevancy`                | helm-chart |                                    | in-cluster kubescape, backend |
+| `ac_8_external_workload_with_cluster_takeover`                | helm-chart |                                    | in-cluster kubescape, backend |
 | `ac_1_1_fix_control_no_relevancy`                | helm-chart |                                    | in-cluster kubescape, backend |
 | `ac_1_1_fix_control_with_relevancy`                | helm-chart |                                    | in-cluster kubescape, backend |
-| `ac_alpine_fix_image_with_relevancy`             | helm-chart |                                    | in-cluster kubescape, backend |
-| `ac_alpine_fix_image_with_relevancy_with_cronjob`             | helm-chart |                                    | in-cluster kubescape, backend |
-| `ac_alpine_fix_control_with_relevancy`             | helm-chart |                                    | in-cluster kubescape, backend |
+| `ac_alpine_workload_external_track_fix_image`             | helm-chart |                                    | in-cluster kubescape, backend |
+| `ac_alpine_workload_external_track_fix_image_with_cronjob`             | helm-chart |                                    | in-cluster kubescape, backend |
+| `ac_alpine_workload_external_track_fix_control`             | helm-chart |                                    | in-cluster kubescape, backend |
 | `ac_alpine_fix_image_no_relevancy`             | helm-chart |                                    | in-cluster kubescape, backend |
 | `ac_alpine_fix_image_no_relevancy_with_cronjob`                | helm-chart |                                    | in-cluster kubescape, backend |
 | `ks_microservice_create_2_cronjob_mitre_and_nsa_proxy`               | helm-chart |                                                                        | in-cluster kubescape, backend |
diff --git a/system_test_mapping.json b/system_test_mapping.json
index 5d2ed93c..1ae8faef 100644
--- a/system_test_mapping.json
+++ b/system_test_mapping.json
@@ -579,16 +579,16 @@
       "Backend"
     ],
     "target_repositories": [
-      "cadashboardbe",
-      "careportsreceiver",
-      "event-ingester-service",
-      "gateway"
+      "cadashboardbe-dummy",
+      "careportsreceiver-dummy",
+      "event-ingester-service-dummy",
+      "gateway-dummy"
     ],
     "description": "",
     "skip_on_environment": "",
     "owner": "eranm@armosec.io"
   },
-  "ac_alpine_fix_image_with_relevancy": {
+  "ac_alpine_workload_external_track_fix_image": {
     "target": [
       "In cluster",
       "Backend"
@@ -603,7 +603,7 @@
     "skip_on_environment": "",
     "owner": "eranm@armosec.io"
   },
-  "ac_alpine_fix_control_with_relevancy": {
+  "ac_alpine_workload_external_track_fix_control": {
     "target": [
       "In cluster",
       "Backend"
@@ -654,16 +654,16 @@
       "Backend"
     ],
     "target_repositories": [
-      "cadashboardbe",
-      "careportsreceiver",
-      "event-ingester-service",
-      "gateway"
+      "cadashboardbe-dummy",
+      "careportsreceiver-dummy",
+      "event-ingester-service-dummy",
+      "gateway-dummy"
     ],
     "description": "",
     "skip_on_environment": "",
     "owner": "eranm@armosec.io"
   },
-  "ac_8_fix_control_with_relevancy": {
+  "ac_8_external_workload_with_cluster_takeover": {
     "target": [
       "In cluster",
       "Backend"
@@ -711,10 +711,10 @@
       "Backend"
     ],
     "target_repositories": [
-      "cadashboardbe",
-      "careportsreceiver",
-      "event-ingester-service",
-      "gateway"
+      "cadashboardbe-dummy",
+      "careportsreceiver-dummy",
+      "event-ingester-service-dummy",
+      "gateway-dummy"
     ],
     "description": "",
     "skip_on_environment": "",