diff --git a/hw/pulpissimo.sv b/hw/pulpissimo.sv
index 82cb162a..b8074e56 100644
--- a/hw/pulpissimo.sv
+++ b/hw/pulpissimo.sv
@@ -30,7 +30,7 @@
 module pulpissimo #(
   /// 0 for CV32E40P with XPULP Extensions, 1 for IBEX RV32IMC (formerly ZERORISCY),
   /// 2 for IBEX RV32EC (formerly MICRORISCY), 3 for CV32E40X
-  parameter  int unsigned CORE_TYPE = 3,
+  parameter  int unsigned CORE_TYPE = 0,
   /// Enable XPULP extensions on CV32E40P. Has no effect if an IBEX core variant is use.
   parameter  bit          USE_XPULP = 1,
   /// Mutually exclusive with the use of IBEX. I.e. if an IBEX core variant is used, this parameter
diff --git a/target/fpga/pulpissimo-zyboz7/rtl/xilinx_pulpissimo.v b/target/fpga/pulpissimo-zyboz7/rtl/xilinx_pulpissimo.v
index 5861ef6e..b06dc791 100644
--- a/target/fpga/pulpissimo-zyboz7/rtl/xilinx_pulpissimo.v
+++ b/target/fpga/pulpissimo-zyboz7/rtl/xilinx_pulpissimo.v
@@ -78,7 +78,7 @@ module xilinx_pulpissimo (
   inout  wire pad_pmodb_10 
 );
 
-  localparam CORE_TYPE = 0; // 0 for RISCY, 1 for IBEX RV32IMC (formerly ZERORISCY), 2 for IBEX RV32EC (formerly MICRORISCY)
+  localparam CORE_TYPE = 3; // 0 for RISCY, 1 for IBEX RV32IMC (formerly ZERORISCY), 2 for IBEX RV32EC (formerly MICRORISCY), 3 for CV32E40X
   localparam USE_FPU   = 0;
   localparam USE_HWPE  = 1;
 
diff --git a/target/sim/tb/tb_pulp.sv b/target/sim/tb/tb_pulp.sv
index ebad1770..b03ceefb 100644
--- a/target/sim/tb/tb_pulp.sv
+++ b/target/sim/tb/tb_pulp.sv
@@ -24,8 +24,8 @@ module tb_pulp;
 
   // simulation platform parameters
 
-  // Choose your core: 0 for RISCY, 1 for IBEX RV32IMC (formerly ZERORISCY), 2 for IBEX RV32EC (formerly MICRORISCY)
-  parameter CORE_TYPE = 0;
+  // Choose your core: 0 for RISCY, 1 for IBEX RV32IMC (formerly ZERORISCY), 2 for IBEX RV32EC (formerly MICRORISCY), 3 for CV32E40X
+  parameter CORE_TYPE = 3;
 
   // if RI5CY is instantiated (CORE_TYPE == 0), USE_FPU enables the FPU
   parameter USE_FPU = 1;