diff --git a/pipelined/config/buildroot/wally-config.vh b/pipelined/config/buildroot/wally-config.vh
index 92abecde..a9a9bc7e 100644
--- a/pipelined/config/buildroot/wally-config.vh
+++ b/pipelined/config/buildroot/wally-config.vh
@@ -78,7 +78,7 @@
 `define RESET_VECTOR 64'h0000000000001000
 
 // WFI Timeout Wait
-`define WFI_TIMEOUT_BIT 20
+`define WFI_TIMEOUT_BIT 16
 
 // Peripheral Addresses
 // Peripheral memory space extends from BASE to BASE+RANGE
diff --git a/pipelined/config/fpga/wally-config.vh b/pipelined/config/fpga/wally-config.vh
index b101a679..863c3385 100644
--- a/pipelined/config/fpga/wally-config.vh
+++ b/pipelined/config/fpga/wally-config.vh
@@ -80,7 +80,7 @@
 `define RESET_VECTOR 64'h0000000000001000
 
 // WFI Timeout Wait
-`define WFI_TIMEOUT_BIT 20
+`define WFI_TIMEOUT_BIT 16
 
 // Peripheral Addresses
 // Peripheral memory space extends from BASE to BASE+RANGE
diff --git a/pipelined/config/rv32e/wally-config.vh b/pipelined/config/rv32e/wally-config.vh
index 5832033a..8774625d 100644
--- a/pipelined/config/rv32e/wally-config.vh
+++ b/pipelined/config/rv32e/wally-config.vh
@@ -81,7 +81,7 @@
 `define RESET_VECTOR 32'h80000000
 
 // WFI Timeout Wait
-`define WFI_TIMEOUT_BIT 20
+`define WFI_TIMEOUT_BIT 16
 
 // Peripheral Addresses
 // Peripheral memory space extends from BASE to BASE+RANGE
diff --git a/pipelined/config/rv32gc/wally-config.vh b/pipelined/config/rv32gc/wally-config.vh
index 41645e8a..5deae9f8 100644
--- a/pipelined/config/rv32gc/wally-config.vh
+++ b/pipelined/config/rv32gc/wally-config.vh
@@ -79,7 +79,7 @@
 `define RESET_VECTOR 32'h80000000
 
 // WFI Timeout Wait
-`define WFI_TIMEOUT_BIT 20
+`define WFI_TIMEOUT_BIT 16
 
 // Peripheral Addresses
 // Peripheral memory space extends from BASE to BASE+RANGE
diff --git a/pipelined/config/rv32i/wally-config.vh b/pipelined/config/rv32i/wally-config.vh
index a263beaa..64560dbb 100644
--- a/pipelined/config/rv32i/wally-config.vh
+++ b/pipelined/config/rv32i/wally-config.vh
@@ -81,7 +81,7 @@
 `define RESET_VECTOR 32'h80000000
 
 // WFI Timeout Wait
-`define WFI_TIMEOUT_BIT 5
+`define WFI_TIMEOUT_BIT 16
 
 // Peripheral Addresses
 // Peripheral memory space extends from BASE to BASE+RANGE
diff --git a/pipelined/config/rv32ic/wally-config.vh b/pipelined/config/rv32ic/wally-config.vh
index b615c739..c0cd6fb8 100644
--- a/pipelined/config/rv32ic/wally-config.vh
+++ b/pipelined/config/rv32ic/wally-config.vh
@@ -79,7 +79,7 @@
 `define RESET_VECTOR 32'h80000000
 
 // WFI Timeout Wait
-`define WFI_TIMEOUT_BIT 20
+`define WFI_TIMEOUT_BIT 16
 
 // Peripheral Addresses
 // Peripheral memory space extends from BASE to BASE+RANGE
diff --git a/pipelined/config/rv64BP/wally-config.vh b/pipelined/config/rv64BP/wally-config.vh
index 417051f1..0f435729 100644
--- a/pipelined/config/rv64BP/wally-config.vh
+++ b/pipelined/config/rv64BP/wally-config.vh
@@ -83,7 +83,7 @@
 `define AHBW 64
 
 // WFI Timeout Wait
-`define WFI_TIMEOUT_BIT 20
+`define WFI_TIMEOUT_BIT 16
 
 // Peripheral Addresses
 // Peripheral memory space extends from BASE to BASE+RANGE
diff --git a/pipelined/config/rv64fp/wally-config.vh b/pipelined/config/rv64fp/wally-config.vh
index da74f981..a99ae2df 100644
--- a/pipelined/config/rv64fp/wally-config.vh
+++ b/pipelined/config/rv64fp/wally-config.vh
@@ -85,7 +85,7 @@
 // Range should be a thermometer code with 0's in the upper bits and 1s in the lower bits
 
 // WFI Timeout Wait
-`define WFI_TIMEOUT_BIT 20
+`define WFI_TIMEOUT_BIT 16
 
 // *** each of these is `PA_BITS wide. is this paramaterizable INSIDE the config file?
 `define BOOTROM_SUPPORTED 1'b1
diff --git a/pipelined/config/rv64gc/wally-config.vh b/pipelined/config/rv64gc/wally-config.vh
index b069a532..f1476ea1 100644
--- a/pipelined/config/rv64gc/wally-config.vh
+++ b/pipelined/config/rv64gc/wally-config.vh
@@ -83,7 +83,7 @@
 `define AHBW 64
 
 // WFI Timeout Wait
-`define WFI_TIMEOUT_BIT 20
+`define WFI_TIMEOUT_BIT 16
 
 // Peripheral Physiccal Addresses
 // Peripheral memory space extends from BASE to BASE+RANGE
diff --git a/pipelined/config/rv64i/wally-config.vh b/pipelined/config/rv64i/wally-config.vh
index e936364c..89e39942 100644
--- a/pipelined/config/rv64i/wally-config.vh
+++ b/pipelined/config/rv64i/wally-config.vh
@@ -83,7 +83,7 @@
 `define AHBW 64
 
 // WFI Timeout Wait
-`define WFI_TIMEOUT_BIT 5
+`define WFI_TIMEOUT_BIT 16
 
 // Peripheral Physiccal Addresses
 // Peripheral memory space extends from BASE to BASE+RANGE
diff --git a/pipelined/config/rv64ic/wally-config.vh b/pipelined/config/rv64ic/wally-config.vh
index 59230476..5dbf70b1 100644
--- a/pipelined/config/rv64ic/wally-config.vh
+++ b/pipelined/config/rv64ic/wally-config.vh
@@ -83,7 +83,7 @@
 `define AHBW 64
 
 // WFI Timeout Wait
-`define WFI_TIMEOUT_BIT 20
+`define WFI_TIMEOUT_BIT 16
 
 // Peripheral Physiccal Addresses
 // Peripheral memory space extends from BASE to BASE+RANGE