diff --git a/hw/rtl/VX_config.vh b/hw/rtl/VX_config.vh
index 82e67786..cc4f7ec4 100644
--- a/hw/rtl/VX_config.vh
+++ b/hw/rtl/VX_config.vh
@@ -89,7 +89,7 @@
 `endif
 
 `ifndef LATENCY_FSQRT
-`define LATENCY_FSQRT 9
+`define LATENCY_FSQRT 10
 `endif
 
 `ifndef LATENCY_ITOF
@@ -100,6 +100,18 @@
 `define LATENCY_FTOI 3
 `endif
 
+`ifndef LATENCY_FADDMUL
+`define LATENCY_FADDMUL 2
+`endif
+
+`ifndef LATENCY_FDIVSQRT
+`define LATENCY_FDIVSQRT 2
+`endif
+
+`ifndef LATENCY_FCONV
+`define LATENCY_FCONV 2
+`endif
+
 // CSR Addresses //////////////////////////////////////////////////////////////
 
 `define CSR_FFLAGS      12'h001
diff --git a/hw/rtl/fp_cores/VX_fpnew.v b/hw/rtl/fp_cores/VX_fpnew.v
index 8d306b17..b575759b 100644
--- a/hw/rtl/fp_cores/VX_fpnew.v
+++ b/hw/rtl/fp_cores/VX_fpnew.v
@@ -53,14 +53,14 @@ module VX_fpnew #(
     };
 
     localparam fpnew_pkg::fpu_implementation_t FPU_IMPLEMENTATION = '{
-      PipeRegs:'{'{`LATENCY_FMADD, 0, 0, 0, 0}, // ADDMUL
-                 '{default: `LATENCY_FDIV},     // DIVSQRT
-                 '{default: `LATENCY_FNONCOMP}, // NONCOMP
-                 '{default: `LATENCY_ITOF}},    // CONV
-      UnitTypes:'{'{default: UNIT_FMULADD},     // ADDMUL
-                  '{default: UNIT_FDIVSQRT},    // DIVSQRT
-                  '{default: UNIT_FNONCOMP},    // NONCOMP
-                  '{default: UNIT_FCONV}},      // CONV
+      PipeRegs:'{'{`LATENCY_FADDMUL, 0, 0, 0, 0}, // ADDMUL
+                 '{default: `LATENCY_FDIVSQRT},   // DIVSQRT
+                 '{default: `LATENCY_FNONCOMP},   // NONCOMP
+                 '{default: `LATENCY_FCONV}},     // CONV
+      UnitTypes:'{'{default: UNIT_FMULADD},       // ADDMUL
+                  '{default: UNIT_FDIVSQRT},      // DIVSQRT
+                  '{default: UNIT_FNONCOMP},      // NONCOMP
+                  '{default: UNIT_FCONV}},        // CONV
       PipeConfig: fpnew_pkg::DISTRIBUTED
     };