diff --git a/hw/chimera_pkg.sv b/hw/chimera_pkg.sv
index f5b1bbd..89754f1 100644
--- a/hw/chimera_pkg.sv
+++ b/hw/chimera_pkg.sv
@@ -96,15 +96,11 @@ package chimera_pkg;
 
   // Cluster domain
   localparam byte_bt [iomsb(ExtClusters):0] ClusterIdx = {8'h4, 8'h3, 8'h2, 8'h1, 8'h0};
-  localparam doub_bt [iomsb(
-ExtClusters
-):0] ClusterRegionStart = {
-    64'h4080_0000, 64'h4060_0000, 64'h4040_0000, 64'h4020_0000, 64'h4000_0000
+  localparam doub_bt [iomsb(ExtClusters):0] ClusterRegionStart = {
+    64'h4100_0000, 64'h40C0_0000, 64'h4080_0000, 64'h4040_0000, 64'h4000_0000
   };
-  localparam doub_bt [iomsb(
-ExtClusters
-):0] ClusterRegionEnd = {
-    64'h40A0_0000, 64'h4080_0000, 64'h4060_0000, 64'h4040_0000, 64'h4020_0000
+  localparam doub_bt [iomsb(ExtClusters):0] ClusterRegionEnd = {
+    64'h4140_0000, 64'h4100_0000, 64'h40C0_0000, 64'h4080_0000, 64'h4040_0000
   };
 
   localparam int ClusterDataWidth = 64;
diff --git a/sw/include/soc_addr_map.h b/sw/include/soc_addr_map.h
index 6445608..783a185 100644
--- a/sw/include/soc_addr_map.h
+++ b/sw/include/soc_addr_map.h
@@ -15,16 +15,16 @@
 #define SOC_CTRL_BASE 0x30001000
 
 #define CLUSTER_0_BASE 0x40000000
-#define CLUSTER_1_BASE 0x40200000
-#define CLUSTER_2_BASE 0x40400000
-#define CLUSTER_3_BASE 0x40600000
-#define CLUSTER_4_BASE 0x40800000
-
-#define CLUSTER_0_NUMCORES 9
-#define CLUSTER_1_NUMCORES 9
-#define CLUSTER_2_NUMCORES 9
-#define CLUSTER_3_NUMCORES 9
-#define CLUSTER_4_NUMCORES 9
+#define CLUSTER_1_BASE 0x40400000
+#define CLUSTER_2_BASE 0x40800000
+#define CLUSTER_3_BASE 0x40C00000
+#define CLUSTER_4_BASE 0x41000000
+
+#define CLUSTER_0_NUMCORES 8
+#define CLUSTER_1_NUMCORES 8
+#define CLUSTER_2_NUMCORES 8
+#define CLUSTER_3_NUMCORES 8
+#define CLUSTER_4_NUMCORES 8
 
 static uint8_t _chimera_numCores[] = {CLUSTER_0_NUMCORES, CLUSTER_1_NUMCORES, CLUSTER_2_NUMCORES,
                                       CLUSTER_3_NUMCORES, CLUSTER_4_NUMCORES};