diff --git a/hack/jenkins/e2e-runner.sh b/hack/jenkins/e2e-runner.sh
index d83a1256c73..f0126db4fcc 100755
--- a/hack/jenkins/e2e-runner.sh
+++ b/hack/jenkins/e2e-runner.sh
@@ -207,8 +207,9 @@ fi
 cd kubernetes
 
 # Upload build start time and k8s version to GCS, but not on PR Jenkins.
+# On PR Jenkins this is done before the build.
 if [[ ! "${JOB_NAME}" =~ -pull- ]]; then
-    bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-started.sh")
+    JENKINS_BUILD_STARTED=true bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-to-gcs.sh")
 fi
 
 # Have cmd/e2e run by goe2e.sh generate JUnit report in ${WORKSPACE}/junit*.xml
diff --git a/hack/jenkins/job-configs/global.yaml b/hack/jenkins/job-configs/global.yaml
index 838d285dfdf..e44b6b3d247 100644
--- a/hack/jenkins/job-configs/global.yaml
+++ b/hack/jenkins/job-configs/global.yaml
@@ -14,40 +14,33 @@
         - postbuildscript:
             builders:
                 - shell: |
-                    curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-finished.sh" > upload-finished.sh
-                    chmod +x upload-finished.sh
+                    mkdir -p _tmp
+                    curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-to-gcs.sh" > ./_tmp/upload-to-gcs.sh
+                    chmod +x ./_tmp/upload-to-gcs.sh
                 - conditional-step:
                     condition-kind: current-status
                     condition-worst: SUCCESS
                     condition-best: SUCCESS
                     steps:
-                        - shell: './upload-finished.sh SUCCESS'
+                        - shell: 'JENKINS_BUILD_FINISHED=SUCCESS ./_tmp/upload-to-gcs.sh'
                 - conditional-step:
                     condition-kind: current-status
                     condition-worst: UNSTABLE
                     condition-best: UNSTABLE
                     steps:
-                        - shell: './upload-finished.sh UNSTABLE'
+                        - shell: 'JENKINS_BUILD_FINISHED=UNSTABLE ./_tmp/upload-to-gcs.sh'
                 - conditional-step:
                     condition-kind: current-status
                     condition-worst: FAILURE
                     condition-best: FAILURE
                     steps:
-                        - shell: './upload-finished.sh FAILURE'
+                        - shell: 'JENKINS_BUILD_FINISHED=FAILURE ./_tmp/upload-to-gcs.sh'
                 - conditional-step:
                     condition-kind: current-status
                     condition-worst: ABORTED
                     condition-best: ABORTED
                     steps:
-                        - shell: './upload-finished.sh ABORTED'
-                # Use our script for build artifacts, since it's more flexible.
-                # Run last since it updates latest-build.txt.
-                - shell: |
-                    if [[ -x ./hack/jenkins/upload-to-gcs.sh ]]; then
-                      ./hack/jenkins/upload-to-gcs.sh
-                    else
-                      curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-to-gcs.sh" | bash -
-                    fi
+                        - shell: 'JENKINS_BUILD_FINISHED=ABORTED ./_tmp/upload-to-gcs.sh'
             script-only-if-succeeded: False
             script-only-if-failed: False
         # Use the plugin for the build log, since it isn't available on Jenkins slaves.
diff --git a/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-build.yaml b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-build.yaml
index 7da1ce916c4..b57904bc0a1 100644
--- a/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-build.yaml
+++ b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-build.yaml
@@ -5,7 +5,7 @@
     logrotate:
         numToKeep: 200
     builders:
-        - shell: 'bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-started.sh")'
+        - shell: 'JENKINS_BUILD_STARTED=true bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-to-gcs.sh")'
         - shell: |
             timeout -k {kill-timeout}m 30m ./hack/jenkins/build.sh && rc=$? || rc=$?
             {report-rc}
diff --git a/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-test-go.yaml b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-test-go.yaml
index 6df68e08a8c..687bb2d6d4b 100644
--- a/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-test-go.yaml
+++ b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-test-go.yaml
@@ -7,7 +7,7 @@
         numToKeep: 200
     node: unittest
     builders:
-        - shell: 'bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-started.sh")'
+        - shell: 'JENKINS_BUILD_STARTED=true bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-to-gcs.sh")'
         - shell: |
             export KUBE_FORCE_VERIFY_CHECKS='y'
             export KUBE_VERIFY_GIT_BRANCH='{branch}'