diff --git a/services/web/Jenkinsfile b/services/web/Jenkinsfile
index 4acb99ab7b..dbabd6ea78 100644
--- a/services/web/Jenkinsfile
+++ b/services/web/Jenkinsfile
@@ -38,6 +38,8 @@ pipeline {
       AR_URL = 'us-east1-docker.pkg.dev/overleaf-ops/ol-docker'
       DOCKER_COMPOSE_FLAGS = '-f docker-compose.ci.yml'
       BRANCH_NAME = "${env.CHANGE_BRANCH ? env.CHANGE_BRANCH : env.BRANCH_NAME}"
+      JENKINS_BUILD_NUMBER = "${BUILD_NUMBER}"       // preserve original BUILD_NUMBER
+      BUILD_NUMBER = "${SHORT_SHA}_${BUILD_NUMBER}"  // mimic the format used for Cloud Build
       COMMIT_SHA = "${GIT_COMMIT}"
       SHORT_SHA = "${GIT_COMMIT.take(7)}"
       CDN_STAG = "gs://ol-stag-web-assets-1"