diff --git a/services/web/Jenkinsfile b/services/web/Jenkinsfile
index 9c98205e77..4acb99ab7b 100644
--- a/services/web/Jenkinsfile
+++ b/services/web/Jenkinsfile
@@ -37,7 +37,7 @@ pipeline {
       AR_REPO_LOCATION = 'us-east1'
       AR_URL = 'us-east1-docker.pkg.dev/overleaf-ops/ol-docker'
       DOCKER_COMPOSE_FLAGS = '-f docker-compose.ci.yml'
-      BRANCH_NAME = "${GIT_BRANCH.replace('origin/', '')}"
+      BRANCH_NAME = "${env.CHANGE_BRANCH ? env.CHANGE_BRANCH : env.BRANCH_NAME}"
       COMMIT_SHA = "${GIT_COMMIT}"
       SHORT_SHA = "${GIT_COMMIT.take(7)}"
       CDN_STAG = "gs://ol-stag-web-assets-1"
diff --git a/services/web/Makefile b/services/web/Makefile
index bb9b74f577..0a2aa70e9c 100644
--- a/services/web/Makefile
+++ b/services/web/Makefile
@@ -510,7 +510,7 @@ IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
 IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME)
 IMAGE_REPO_BRANCH ?= $(IMAGE_REPO):$(BRANCH_NAME)
 IMAGE_REPO_MAIN ?= $(IMAGE_REPO):main
-IMAGE_REPO_FINAL ?= $(IMAGE_REPO_BRANCH)-$(BUILD_NUMBER)
+IMAGE_REPO_FINAL ?= $(IMAGE_REPO_BRANCH)-$(SHORT_SHA)_$(BUILD_NUMBER)
 
 export SENTRY_RELEASE ?= ${COMMIT_SHA}