diff --git a/rtl/ibex_core.sv b/rtl/ibex_core.sv
index 2efb92f9..f6f3cfdd 100644
--- a/rtl/ibex_core.sv
+++ b/rtl/ibex_core.sv
@@ -129,10 +129,10 @@ module ibex_core #(
 
   // CSR control
   logic        csr_access_ex;
-  logic  [1:0] csr_op_ex;
+  csr_op_e     csr_op_ex;
 
   logic        csr_access;
-  logic  [1:0] csr_op;
+  csr_op_e     csr_op;
   csr_num_e    csr_addr;
   logic [31:0] csr_rdata;
   logic [31:0] csr_wdata;
diff --git a/rtl/ibex_id_stage.sv b/rtl/ibex_id_stage.sv
index a3aefc35..d85ac650 100644
--- a/rtl/ibex_id_stage.sv
+++ b/rtl/ibex_id_stage.sv
@@ -86,7 +86,7 @@ module ibex_id_stage #(
 
     // CSR
     output logic                      csr_access_ex_o,
-    output logic [1:0]                csr_op_ex_o,
+    output ibex_defines::csr_op_e     csr_op_ex_o,
     output ibex_defines::exc_cause_e  csr_cause_o,
     output logic                      csr_save_if_o,
     output logic                      csr_save_id_o,
@@ -220,7 +220,7 @@ module ibex_id_stage #(
 
   // CSR control
   logic        csr_access;
-  logic [1:0]  csr_op;
+  csr_op_e     csr_op;
   logic        csr_status;
 
   // Forwarding