diff --git a/contrib/variant/new_variant.py b/contrib/variant/new_variant.py
index 3cc4220..0a4ef50 100755
--- a/contrib/variant/new_variant.py
+++ b/contrib/variant/new_variant.py
@@ -1459,6 +1459,7 @@
     cmd = [
         'git',
         'filter-branch',
+        '-f',
         '--msg-filter',
         f'sed -E "s/^(Change-Id: {change_id})$/{cq_depend_str}\\n\\1/"',
         '--',
diff --git a/contrib/variant/puff.py b/contrib/variant/puff.py
index c7ae3a0..84b1eca 100644
--- a/contrib/variant/puff.py
+++ b/contrib/variant/puff.py
@@ -90,6 +90,5 @@
 depends = {
     step_names.CB_CONFIG: [step_names.FIND],
     step_names.FW_BUILD_CONFIG: [
-        step_names.FIND, step_names.CB_VARIANT, step_names.CB_CONFIG,
-        step_names.COMMIT_FIT]
+        step_names.FIND, step_names.CB_CONFIG, step_names.COMMIT_FIT]
 }
diff --git a/contrib/variant/trembyle.py b/contrib/variant/trembyle.py
index 6301d16..00f0fef 100644
--- a/contrib/variant/trembyle.py
+++ b/contrib/variant/trembyle.py
@@ -70,6 +70,6 @@
 depends = {
     step_names.CB_CONFIG: [step_names.CB_VARIANT],
     step_names.FW_BUILD_CONFIG: [
-        step_names.FIND, step_names.CB_VARIANT, step_names.CB_CONFIG,
+        step_names.CB_VARIANT, step_names.CB_CONFIG,
         step_names.CRAS_CONFIG, step_names.EC_IMAGE, step_names.COMMIT_FIT]
 }
diff --git a/contrib/variant/volteer.py b/contrib/variant/volteer.py
index c1b309a..a8b4ab0 100644
--- a/contrib/variant/volteer.py
+++ b/contrib/variant/volteer.py
@@ -84,6 +84,6 @@
 depends = {
     step_names.CB_CONFIG: [step_names.FIND],
     step_names.FW_BUILD_CONFIG: [
-        step_names.FIND, step_names.CB_VARIANT, step_names.CB_CONFIG,
+        step_names.FIND, step_names.CB_CONFIG,
         step_names.COMMIT_FIT, step_names.EC_IMAGE]
 }
diff --git a/contrib/variant/waddledee.py b/contrib/variant/waddledee.py
index 75cc82b..b187a62 100644
--- a/contrib/variant/waddledee.py
+++ b/contrib/variant/waddledee.py
@@ -84,6 +84,6 @@
 depends = {
     step_names.CB_CONFIG: [step_names.FIND],
     step_names.FW_BUILD_CONFIG: [
-        step_names.FIND, step_names.CB_VARIANT, step_names.CB_CONFIG,
+        step_names.FIND, step_names.CB_CONFIG,
         step_names.COMMIT_FIT, step_names.EC_IMAGE]
 }