diff --git a/.zuul.yaml b/.zuul.yaml
index 851fb183..1fa93ddd 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -376,6 +376,17 @@
       Grenade job that skips a release, validating that deployers can skip
       specific releases as prescribed by our process.
     parent: grenade
+    # NOTE(gmann): This job is meant to validate the tick to tick release
+    # upgrade so supposed to run on tick release gate only. To make sure
+    # that, when the current master is tock release, below branch variant will
+    # stop running it on tock release master. And once new tick release start
+    # (means the current master is tick release), we need to remove the below
+    # branch variant condition so that it again start running on tick release
+    # master gate.
+    # Along with grenade gate, this job runs on many other projects gate
+    # also and in this job definition, we control for everyone to run on tick
+    # release only.
+    branches: ^(?!master).*$
     vars:
       # Move this forward when master changes to a new skip-level-allowed
       # target release. Right now, this is wallaby because master is yoga.
diff --git a/roles/configure-grenade-branches/defaults/main.yaml b/roles/configure-grenade-branches/defaults/main.yaml
index 5fe22727..49c19fda 100644
--- a/roles/configure-grenade-branches/defaults/main.yaml
+++ b/roles/configure-grenade-branches/defaults/main.yaml
@@ -1,3 +1,3 @@
 ---
-grenade_from_branch: stable/xena
+grenade_from_branch: stable/yoga
 grenade_to_branch: master