diff --git a/config/rv32gc/wally-config.vh b/config/rv32gc/wally-config.vh
index 896e10bab..4eb71c54e 100644
--- a/config/rv32gc/wally-config.vh
+++ b/config/rv32gc/wally-config.vh
@@ -133,7 +133,7 @@
 `define PLIC_UART_ID 10
 
 `define BPRED_SUPPORTED 1
-`define BPRED_TYPE "BP_LOCAL_REPAIR" // BP_GSHARE_BASIC, BP_GLOBAL, BP_GLOBAL_BASIC, BP_TWOBIT
+`define BPRED_TYPE "BP_GSHARE" // "BP_LOCAL_REPAIR" // BP_GSHARE_BASIC, BP_GLOBAL, BP_GLOBAL_BASIC, BP_TWOBIT
 `define BPRED_SIZE 16
 `define BPRED_NUM_LHR 8
 `define BTB_SIZE 10
diff --git a/config/rv64gc/wally-config.vh b/config/rv64gc/wally-config.vh
index 15edef590..c933d87ae 100644
--- a/config/rv64gc/wally-config.vh
+++ b/config/rv64gc/wally-config.vh
@@ -137,7 +137,7 @@
 
 `define BPRED_SUPPORTED 1
 //`define BPRED_TYPE "BP_GLOBAL_BASIC" // BP_GSHARE_BASIC, BP_GLOBAL, BP_GLOBAL_BASIC, BP_TWOBIT
-`define BPRED_TYPE "BP_LOCAL_REPAIR" // BP_GSHARE_BASIC, BP_GLOBAL, BP_GLOBAL_BASIC, BP_TWOBIT
+`define BPRED_TYPE "BP_GSHARE" // "BP_LOCAL_REPAIR" // BP_GSHARE_BASIC, BP_GLOBAL, BP_GLOBAL_BASIC, BP_TWOBIT
 `define BPRED_SIZE 6
 `define BPRED_NUM_LHR 4
 `define BTB_SIZE 10
diff --git a/src/ifu/bpred/bpred.sv b/src/ifu/bpred/bpred.sv
index 50415d449..355e30fc2 100644
--- a/src/ifu/bpred/bpred.sv
+++ b/src/ifu/bpred/bpred.sv
@@ -28,7 +28,7 @@
 
 `include "wally-config.vh"
 
-`define INSTR_CLASS_PRED 0
+`define INSTR_CLASS_PRED 1
 
 module bpred (
   input  logic             clk, reset,