diff --git a/bin/lib/cv_regression.py b/bin/lib/cv_regression.py
index d68b00a960..076175f676 100644
--- a/bin/lib/cv_regression.py
+++ b/bin/lib/cv_regression.py
@@ -96,11 +96,6 @@ def __init__(self, **kwargs):
         if not hasattr(self, 'log'):
             self.log = self.name
 
-        if hasattr(self, 'seed'):
-            self.seed_override = 1
-        else:
-            self.seed_override = 0
-
     def set_cov(self):
         '''Set the coverage flag based on app setting.
         If cov already defined (from testlist), then ignore'''
diff --git a/bin/templates/regress_rmdb.j2 b/bin/templates/regress_rmdb.j2
index ffc37bfe86..7fa6ce2c77 100644
--- a/bin/templates/regress_rmdb.j2
+++ b/bin/templates/regress_rmdb.j2
@@ -61,8 +61,8 @@
     </usertcl>
 
     <usertcl name="seedGen">
-        proc getSeeds { num mode regr_name seed_override seed_value } {
-            if { $seed_override == "1" } {
+        proc getSeeds { num mode regr_name seed_value } {
+            if { $seed_value != "" } {
                 return $seed_value
             }
             if {[string equal $mode "FIXED"]} {
@@ -186,7 +186,7 @@
                     <parameter name="t_test_cfg_name" type="tcl">[getTestCfgName "(%t_test_cfg:%)"]</parameter>
                     <parameter name="t_iss"           type="tcl">[getParameterByPriorityYesOrNo "{{iss}}" "{{t.iss}}" "(%build_iss:%)"]</parameter>
                     <parameter name="t_cov"           type="tcl">[getParameterByPriorityYesOrNo "{{coverage}}" "{{t.cov}}" "(%build_cov:%)"]</parameter>
-                    <parameter name="seeds"           type="tcl">[getSeeds "{{t.num}}" "(%SEED_MODE:RAND%)" "(%reg_name%)" "{{t.seed_override}}" "{{t.seed}}"]</parameter>
+                    <parameter name="seeds"           type="tcl">[getSeeds "{{t.num}}" "(%SEED_MODE:RAND%)" "(%reg_name%)" "{{t.seed}}"]</parameter>
                     <parameter name="ucdb_path"       type="tcl">[file join "(%results_sim_path%)" "(%t_cfg%)" "{{t.testname}}" "(%t_test_cfg_name:%)" (%t_iteration%)]</parameter>
                     <parameter name="testname"        type="tcl">[getTestName "{{t.testname}}" "(%t_cfg%)" "(%t_test_cfg_name:%)" (%t_iteration%)]</parameter>
                     <parameter name="ucdb_basename"   type="tcl">[getUCDBFilename "{{t.testname}}" "(%t_test_cfg_name:%)"]</parameter>
diff --git a/cv32e40p/tests/programs/custom/custom_opcode_illegal_test/custom_opcode_illegal_test.S b/cv32e40p/tests/programs/custom/custom_opcode_illegal_test/custom_opcode_illegal_test.S
index c36b6e19ab..3cb4f75898 100644
--- a/cv32e40p/tests/programs/custom/custom_opcode_illegal_test/custom_opcode_illegal_test.S
+++ b/cv32e40p/tests/programs/custom/custom_opcode_illegal_test/custom_opcode_illegal_test.S
@@ -1,3 +1,6 @@
+# Copyright 2024 Dolphin Design
+# SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
+
 .include "user_define.h"
 .section .text.start
 
@@ -92,7 +95,7 @@ main:             fence.i
                   .4byte 0x80fe4c33 # manual: opcode = OP, func7 = 1000000
                   .4byte 0x00200073 # manual: instr uret, opcode = SYSTEM, [31:20] = h002
                   .4byte 0xb1600073 # manual: random [31:20], opcode = SYSTEM
-                  
+
 
                   # Generated instructions
                   .4byte 0x3e0003fb # custom-3