diff --git a/jenkins/checker_definitions.txt b/jenkins/checker_definitions.txt
index 879e706..fede5ed 100644
--- a/jenkins/checker_definitions.txt
+++ b/jenkins/checker_definitions.txt
@@ -5,7 +5,7 @@
     "name": "RBE Build/Tests",
     "description": "Builds the code base and executes unit/integration tests on RBE",
     "repository": "gerrit",
-    "query": "(not dir:polygerrit-ui) AND (branch:stable-3.4 OR branch:stable-3.5 OR branch:master)",
+    "query": "(not dir:polygerrit-ui) AND (branch:stable-3.4 OR branch:stable-3.5 OR branch:stable-3.6 OR branch:master)",
     "blocking": []
   }
 
@@ -16,7 +16,7 @@
     "name": "Build/Tests",
     "description": "Builds the code base and executes unit/integration tests",
     "repository": "gerrit",
-    "query": "(not dir:polygerrit-ui) AND (branch:stable-3.3 OR branch:stable-3.4 OR branch:stable-3.5 OR branch:master)",
+    "query": "(not dir:polygerrit-ui) AND (branch:stable-3.3 OR branch:stable-3.4 OR branch:stable-3.5 OR branch:stable-3.6 OR branch:master)",
     "blocking": []
   }
 
@@ -27,7 +27,7 @@
     "name": "PolyGerrit UI Tests",
     "description": "Executes unit/integration tests for PolyGerrit UI",
     "repository": "gerrit",
-    "query": "(dir:polygerrit-ui OR file:WORKSPACE) AND (branch:stable-3.3 OR branch:stable-3.4 OR branch:stable-3.5 OR branch:master)",
+    "query": "(dir:polygerrit-ui OR file:WORKSPACE) AND (branch:stable-3.3 OR branch:stable-3.4 OR branch:stable-3.5 OR branch:stable-3.6 OR branch:master)",
     "blocking": []
   }
 
@@ -38,6 +38,6 @@
     "name": "Code Style",
     "description": "Executes Code Style tests",
     "repository": "gerrit",
-    "query": "branch:stable-3.3 OR branch:stable-3.4 OR branch:stable-3.5 OR branch:master",
+    "query": "branch:stable-3.3 OR branch:stable-3.4 OR branch:stable-3.5 OR branch:stable-3.6 OR branch:master",
     "blocking": []
   }
diff --git a/jenkins/gerrit-bazel-template.yaml b/jenkins/gerrit-bazel-template.yaml
index 138a550..31cbc37 100644
--- a/jenkins/gerrit-bazel-template.yaml
+++ b/jenkins/gerrit-bazel-template.yaml
@@ -75,6 +75,7 @@
     name: Gerrit-bazel-chrome-latest
     branch:
       - master
+      - stable-3.6
       - stable-3.5
     browser: chrome-latest
     jobs:
diff --git a/jenkins/gerrit-bazel-verifier-test.sh b/jenkins/gerrit-bazel-verifier-test.sh
index 04eaf7a..3d8f0aa 100755
--- a/jenkins/gerrit-bazel-verifier-test.sh
+++ b/jenkins/gerrit-bazel-verifier-test.sh
@@ -15,11 +15,11 @@
 echo '----------------------------------------------'
 
 case $TARGET_BRANCH$MODE in
-  masterrbe|stable-3.4rbe|stable-3.5rbe)
+  masterrbe|stable-3.4rbe|stable-3.5rbe|stable-3.6rbe)
     TEST_TAG_FILTER="-flaky,-elastic,-no_rbe"
     BAZEL_OPTS="--config=remote --remote_instance_name=projects/api-project-164060093628/instances/default_instance"
     ;;
-  masternotedb|stable-3.4notedb|stable-3.5notedb)
+  masternotedb|stable-3.4notedb|stable-3.5notedb|stable-3.6notedb)
     TEST_TAG_FILTER="-flaky,elastic,no_rbe"
     ;;
   stable-2.*)