diff --git a/redis_benchmarks_specification/__runner__/runner.py b/redis_benchmarks_specification/__runner__/runner.py
index a9f44f8..e529fe8 100644
--- a/redis_benchmarks_specification/__runner__/runner.py
+++ b/redis_benchmarks_specification/__runner__/runner.py
@@ -1686,7 +1686,7 @@ def delete_temporary_files(
                         logging.info(
                             f"Connected to Redis using individual parameters: {host}:{port}"
                         )
-                    setup_name = "oss-standalone"
+                    setup_name = topology_spec_name
                     r.ping()
 
                     # Auto-detect server information if not explicitly provided
@@ -2440,7 +2440,7 @@ def delete_temporary_files(
                         start_time_str,
                         git_hash,
                         test_name,
-                        setup_type,
+                        setup_name,
                     )
                     logging.info(
                         "Will store benchmark json output to local file {}".format(
@@ -2872,6 +2872,7 @@ def delete_temporary_files(
                             test_name,
                             results_matrix,
                             redis_conns,
+                            setup_name,
                         )
                     else:
                         # Single client - read from file as usual
@@ -2950,6 +2951,7 @@ def delete_temporary_files(
                             test_name,
                             results_matrix,
                             redis_conns,
+                            setup_name,
                         )
 
                     dataset_load_duration_seconds = 0
@@ -3525,6 +3527,7 @@ def prepare_overall_total_test_results(
     test_name,
     overall_results_matrix,
     redis_conns=None,
+    topology=None,
 ):
     # check which metrics to extract
     (
@@ -3560,8 +3563,13 @@ def get_overall_display_name(x):
 
         return x[0]  # Use original path
 
+    # Include topology in the test name if provided
+    test_name_with_topology = test_name
+    if topology:
+        test_name_with_topology = f"{topology}-{test_name}"
+
     current_test_results_matrix = [
-        [test_name, get_overall_display_name(x), f"{x[3]:.3f}"]
+        [test_name_with_topology, get_overall_display_name(x), f"{x[3]:.3f}"]
         for x in current_test_results_matrix
     ]
     overall_results_matrix.extend(current_test_results_matrix)