diff --git a/Makefile b/Makefile
index 1fe2d9fd..16bc5f14 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ sw-clean:
 
 ## Clone pulp-runtime as SW stack
 PULP_RUNTIME_REMOTE ?= https://github.com/pulp-platform/pulp-runtime.git
-PULP_RUNTIME_COMMIT ?= 1e3bccf # branch: lg/upstream
+PULP_RUNTIME_COMMIT ?= aca74d1 # branch: lg/upstream
 
 pulp-runtime:
 	git clone $(PULP_RUNTIME_REMOTE) $@
diff --git a/rtl/pulp_cluster.sv b/rtl/pulp_cluster.sv
index 9db98e62..aff06231 100644
--- a/rtl/pulp_cluster.sv
+++ b/rtl/pulp_cluster.sv
@@ -1027,7 +1027,7 @@ generate
       .test_en_i           ( test_mode_i           ),
       .clk_en_i            ( clk_core_en[i]        ),
       .base_addr_i         ( base_addr_i           ),
-      .cluster_id_i        ( '0                    ),
+      .cluster_id_i        ( cluster_id_i          ),
       .ext_perf_o          ( ext_perf[i]           ),
       .core_data_req_i     ( demux_data_req[i]     ),
       .core_data_rsp_o     ( demux_data_rsp[i]     ),
diff --git a/tb/pulp_cluster_tb.sv b/tb/pulp_cluster_tb.sv
index 5291c2d6..054341c1 100644
--- a/tb/pulp_cluster_tb.sv
+++ b/tb/pulp_cluster_tb.sv
@@ -212,8 +212,8 @@ module pulp_cluster_tb;
   };
   assign addr_map[2] = '{ // Pulp Cluster
     idx:        2,
-    start_addr: ClustBaseAddr,
-    end_addr:   ClustBaseAddr + ClustExtOffs
+    start_addr: ClustBase,
+    end_addr:   ClustBase + ClustExtOffs
   };
 
   // Crossbar Configuration and Instantiation