diff --git a/vars/gerritPipeline.groovy b/vars/gerritPipeline.groovy
index 385c741..2bd9288 100644
--- a/vars/gerritPipeline.groovy
+++ b/vars/gerritPipeline.groovy
@@ -131,9 +131,13 @@
 
 def collectBuildModes() {
     Builds.modes = []
-    if (env.GERRIT_BRANCH == "master" || env.GERRIT_BRANCH == "stable-3.4" || env.GERRIT_BRANCH == "stable-3.4-2021-07.sticky-approvals") {
+    if (env.GERRIT_BRANCH == "master" || env.GERRIT_BRANCH == "stable-3.4" ||
+        env.GERRIT_BRANCH == "stable-3.4-2021-07.sticky-approvals" ||
+        env.GERRIT_BRANCH == "stable-3.4-2021-07") {
         Builds.modes = ["notedb", "rbe"]
-    } else if (env.GERRIT_BRANCH ==~ /stable-3.[0-3]/ || env.GERRIT_BRANCH == "stable-3.1-2021-07.includedIn") {
+    } else if (env.GERRIT_BRANCH ==~ /stable-3.[0-3]/ ||
+               env.GERRIT_BRANCH == "stable-3.1-2021-07.includedIn" ||
+               env.GERRIT_BRANCH ==~ /stable-3.[1-3]-2021-07/) {
         Builds.modes = ["notedb"]
     } else if (env.GERRIT_BRANCH == "stable-2.16") {
         Builds.modes = ["notedb", "reviewdb"]