diff --git a/Jenkinsfile b/Jenkinsfile
index edd4234033..5f93803f27 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -54,7 +54,10 @@ class GerritCheck {
     }
 
     def getCheckResultFromBuild() {
-        def resultString = build.result.toString()
+        if (!build.getResult()) {
+            return "RUNNING"
+        }
+        def resultString = build.getResult().toString()
         if (resultString == 'SUCCESS') {
             return "SUCCESSFUL"
         } else if (resultString == 'NOT_BUILT' || resultString == 'ABORTED') {
@@ -108,6 +111,9 @@ def prepareBuildsForMode(buildName, mode="notedb", retryTimes = 1) {
             def slaveBuild = null
             for (int i = 1; i <= retryTimes; i++) {
                 try {
+                    postCheck(new GerritCheck(
+                        (buildName == "Gerrit-codestyle") ? "codestyle" : mode,
+                        new Build(currentBuild.getAbsoluteUrl(), null)))
                     slaveBuild = build job: "${buildName}", parameters: [
                         string(name: 'REFSPEC', value: "refs/changes/${env.BRANCH_NAME}"),
                         string(name: 'BRANCH', value: env.GERRIT_PATCHSET_REVISION),
@@ -119,9 +125,11 @@ def prepareBuildsForMode(buildName, mode="notedb", retryTimes = 1) {
                     if (buildName == "Gerrit-codestyle"){
                         Builds.codeStyle = new Build(
                             slaveBuild.getAbsoluteUrl(), slaveBuild.getResult())
+                        postCheck(new GerritCheck("codestyle", Builds.codeStyle))
                     } else {
                         Builds.verification[mode] = new Build(
                             slaveBuild.getAbsoluteUrl(), slaveBuild.getResult())
+                        postCheck(new GerritCheck(mode, Builds.verification[mode]))
                     }
                     if (slaveBuild.getResult() == "SUCCESS") {
                         break
@@ -235,7 +243,6 @@ node ('master') {
         stage('Report to Gerrit'){
             resCodeStyle = getLabelValue(1, Builds.codeStyle.result)
             gerritReview labels: ['Code-Style': resCodeStyle]
-            postCheck(new GerritCheck("codestyle", Builds.codeStyle))
 
             def verificationResults = Builds.verification.collect { k, v -> v }
             def resVerify = verificationResults.inject(1) {
@@ -243,10 +250,6 @@ node ('master') {
             }
             gerritReview labels: ['Verified': resVerify]
 
-            Builds.verification.each { type, build -> postCheck(
-                new GerritCheck(type, build)
-            )}
-
             setResult(resVerify, resCodeStyle)
         }
     }
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
index dd3e36478d..9d0319cd6e 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -53,7 +53,7 @@ public class ElasticContainer extends ElasticsearchContainer {
       case V6_7:
         return "blacktop/elasticsearch:6.7.2";
       case V6_8:
-        return "blacktop/elasticsearch:6.8.7";
+        return "blacktop/elasticsearch:6.8.8";
       case V7_0:
         return "blacktop/elasticsearch:7.0.1";
       case V7_1:
@@ -67,7 +67,7 @@ public class ElasticContainer extends ElasticsearchContainer {
       case V7_5:
         return "blacktop/elasticsearch:7.5.2";
       case V7_6:
-        return "blacktop/elasticsearch:7.6.1";
+        return "blacktop/elasticsearch:7.6.2";
     }
     throw new IllegalStateException("No tests for version: " + version.name());
   }
diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl
index effc5fc35f..074071bff8 100644
--- a/tools/nongoogle.bzl
+++ b/tools/nongoogle.bzl
@@ -94,8 +94,8 @@ def declare_nongoogle_deps():
     # and httpasyncclient as necessary.
     maven_jar(
         name = "elasticsearch-rest-client",
-        artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.6.1",
-        sha1 = "6fb9f72e9d86a8c503f26f28fa7271f4ac065709",
+        artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.6.2",
+        sha1 = "3da6691dcd1864243f11f07d51907320452c6400",
     )
 
     maven_jar(