diff --git a/config/buildroot/wally-config.vh b/config/buildroot/wally-config.vh
index 656bfbe4c..a42587d96 100644
--- a/config/buildroot/wally-config.vh
+++ b/config/buildroot/wally-config.vh
@@ -132,7 +132,7 @@
 `define BPRED_SUPPORTED 1
 `define BPRED_TYPE "BPGSHARE" // BPLOCALPAg or BPGLOBAL or BPTWOBIT or BPGSHARE
 `define BPRED_SIZE 10
-`define BTB_SIZE (`BPRED_SIZE)
+`define BTB_SIZE 10
 
 
 `define HPTW_WRITES_SUPPORTED 1
diff --git a/config/fpga/wally-config.vh b/config/fpga/wally-config.vh
index a4c97a86e..6f52e3e9a 100644
--- a/config/fpga/wally-config.vh
+++ b/config/fpga/wally-config.vh
@@ -141,7 +141,7 @@
 `define BPRED_SUPPORTED 1
 `define BPRED_TYPE "BPSPECULATIVEGSHARE" // BPLOCALPAg or BPGLOBAL or BPTWOBIT or BPGSHARE or BPSPECULATIVEGLOBAL or BPSPECULATIVEGSHARE or BPOLDGSHARE or BPOLDGSHARE2
 `define BPRED_SIZE 10
-`define BTB_SIZE (`BPRED_SIZE)
+`define BTB_SIZE 10
 
 
 `define HPTW_WRITES_SUPPORTED 1
diff --git a/config/rv32e/wally-config.vh b/config/rv32e/wally-config.vh
index 8a0dd5f4b..296bcbea8 100644
--- a/config/rv32e/wally-config.vh
+++ b/config/rv32e/wally-config.vh
@@ -136,7 +136,7 @@
 `define BPRED_SUPPORTED 0
 `define BPRED_TYPE "BPGSHARE" // BPLOCALPAg or BPGLOBAL or BPTWOBIT or BPGSHARE
 `define BPRED_SIZE 10
-`define BTB_SIZE (`BPRED_SIZE)
+`define BTB_SIZE 10
 
 `define HPTW_WRITES_SUPPORTED 0
 
diff --git a/config/rv32gc/wally-config.vh b/config/rv32gc/wally-config.vh
index 07b4668ec..28d91e58b 100644
--- a/config/rv32gc/wally-config.vh
+++ b/config/rv32gc/wally-config.vh
@@ -135,7 +135,7 @@
 `define BPRED_SUPPORTED 1
 `define BPRED_TYPE "BPSPECULATIVEGSHARE" // BPLOCALPAg or BPGLOBAL or BPTWOBIT or BPGSHARE
 `define BPRED_SIZE 10
-`define BTB_SIZE (`BPRED_SIZE)
+`define BTB_SIZE 10
 
 `define HPTW_WRITES_SUPPORTED 0
 
diff --git a/config/rv32i/wally-config.vh b/config/rv32i/wally-config.vh
index 4ef0b60e7..60cba64a3 100644
--- a/config/rv32i/wally-config.vh
+++ b/config/rv32i/wally-config.vh
@@ -136,7 +136,7 @@
 `define BPRED_SUPPORTED 0
 `define BPRED_TYPE "BPGSHARE" // BPLOCALPAg or BPGLOBAL or BPTWOBIT or BPGSHARE
 `define BPRED_SIZE 10
-`define BTB_SIZE (`BPRED_SIZE)
+`define BTB_SIZE 10
 
 `define HPTW_WRITES_SUPPORTED 0
 
diff --git a/config/rv32imc/wally-config.vh b/config/rv32imc/wally-config.vh
index 19da7c42f..9d263ae39 100644
--- a/config/rv32imc/wally-config.vh
+++ b/config/rv32imc/wally-config.vh
@@ -135,7 +135,7 @@
 `define BPRED_SUPPORTED 0
 `define BPRED_TYPE "BPSPECULATIVEGSHARE" // BPLOCALPAg or BPGLOBAL or BPTWOBIT or BPGSHARE
 `define BPRED_SIZE 10
-`define BTB_SIZE (`BPRED_SIZE)
+`define BTB_SIZE 10
 
 `define HPTW_WRITES_SUPPORTED 0
 
diff --git a/config/rv64fpquad/wally-config.vh b/config/rv64fpquad/wally-config.vh
index 7f0c2a048..00b193029 100644
--- a/config/rv64fpquad/wally-config.vh
+++ b/config/rv64fpquad/wally-config.vh
@@ -138,7 +138,7 @@
 `define BPRED_SUPPORTED 1
 `define BPRED_TYPE "BPGSHARE" // BPLOCALPAg or BPGLOBAL or BPTWOBIT or BPGSHARE
 `define BPRED_SIZE 10
-`define BTB_SIZE (`BPRED_SIZE)
+`define BTB_SIZE 10
 
 `define HPTW_WRITES_SUPPORTED 0
 
diff --git a/config/rv64gc/wally-config.vh b/config/rv64gc/wally-config.vh
index d163dc34b..d61d66c67 100644
--- a/config/rv64gc/wally-config.vh
+++ b/config/rv64gc/wally-config.vh
@@ -138,7 +138,7 @@
 `define BPRED_SUPPORTED 1
 `define BPRED_TYPE "BPSPECULATIVEGSHARE" // BPLOCALPAg or BPGLOBAL or BPTWOBIT or BPGSHARE or BPSPECULATIVEGLOBAL or BPSPECULATIVEGSHARE or BPOLDGSHARE or BPOLDGSHARE2
 `define BPRED_SIZE 10
-`define BTB_SIZE (`BPRED_SIZE)
+`define BTB_SIZE 10
 
 `define HPTW_WRITES_SUPPORTED 0
 
diff --git a/config/rv64i/wally-config.vh b/config/rv64i/wally-config.vh
index 24a171a75..7cc8d887e 100644
--- a/config/rv64i/wally-config.vh
+++ b/config/rv64i/wally-config.vh
@@ -138,7 +138,7 @@
 `define BPRED_SUPPORTED 0
 `define BPRED_TYPE "BPGSHARE" // BPLOCALPAg or BPGLOBAL or BPTWOBIT or BPGSHARE
 `define BPRED_SIZE 10
-`define BTB_SIZE (`BPRED_SIZE)
+`define BTB_SIZE 10
 
 `define HPTW_WRITES_SUPPORTED 0
 
diff --git a/src/ifu/bpred/btb.sv b/src/ifu/bpred/btb.sv
index 7893ace5f..bf64ccbe8 100644
--- a/src/ifu/bpred/btb.sv
+++ b/src/ifu/bpred/btb.sv
@@ -30,7 +30,7 @@
 
 `include "wally-config.vh"
 
-module btb #(parameter int Depth = 10 ) (
+module btb #(parameter Depth = 10 ) (
   input  logic             clk,
   input  logic             reset,
   input  logic             StallF, StallD, StallM, FlushD, FlushM,
diff --git a/synthDC/Makefile b/synthDC/Makefile
index 5ea9677c5..136e610d2 100755
--- a/synthDC/Makefile
+++ b/synthDC/Makefile
@@ -72,6 +72,7 @@ else
 	sed -i 's/WAYSIZEINBYTES.*/WAYSIZEINBYTES 512/g' $(CONFIGDIR)/wally-config.vh
 	sed -i 's/NUMWAYS.*/NUMWAYS 1/g' $(CONFIGDIR)/wally-config.vh
 	sed -i 's/BPRED_SIZE.*/BPRED_SIZE 5/g' $(CONFIGDIR)/wally-config.vh
+	sed -i 's/BTB_SIZE.*/BTB_SIZE 5/g' $(CONFIGDIR)/wally-config.vh
 ifneq ($(filter $(CONFIG), $(DIRS32)),)
 	sed -i "s/BOOTROM_RANGE.*/BOOTROM_RANGE	 34\'h01FF/g" $(CONFIGDIR)/wally-config.vh
 	sed -i "s/UNCORE_RAM_RANGE.*/UNCORE_RAM_RANGE	 34\'h01FF/g" $(CONFIGDIR)/wally-config.vh