diff --git a/deployment/build-branded-images.sh b/deployment/build-branded-images.sh
index 36eb2b585..82a8f461e 100755
--- a/deployment/build-branded-images.sh
+++ b/deployment/build-branded-images.sh
@@ -13,7 +13,7 @@ SCRIPT_DIR=$(dirname $SCRIPT_PATH)
 CONFIGURATION=${CONFIGURATION:-"example"}
 DOCKERHUB_ORGANISATION=${DOCKERHUB_ORGANISATION:-"ocelotsocialnetwork"}
 OCELOT_VERSION=${OCELOT_VERSION:-$(node -p -e "require('${SCRIPT_DIR}/../package.json').version")}
-BRANDED_VERSION=${BRANDED_VERSION:-${OCELOT_VERSION}-${GITHUB_RUN_NUMBER:-0}}
+BRANDED_VERSION=${BRANDED_VERSION:-${GITHUB_RUN_NUMBER:-"local"}}
 BUILD_DATE=${BUILD_DATE:-$(date -u +'%Y-%m-%dT%H:%M:%SZ')}
 BUILD_VERSION=${BRANDED_VERSION}-ocelot.social${OCELOT_VERSION}
 BUILD_COMMIT=${GITHUB_SHA:-"0000000"}
@@ -22,7 +22,7 @@ BUILD_COMMIT=${GITHUB_SHA:-"0000000"}
 docker build --target branded \
     -t "${DOCKERHUB_ORGANISATION}/backend-branded:latest" \
     -t "${DOCKERHUB_ORGANISATION}/backend-branded:${OCELOT_VERSION}" \
-    -t "${DOCKERHUB_ORGANISATION}/backend-branded:${BRANDED_VERSION}" \
+    -t "${DOCKERHUB_ORGANISATION}/backend-branded:${BUILD_VERSION}" \
     -f "${SCRIPT_DIR}/src/docker/backend.Dockerfile" \
     --build-arg "CONFIGURATION=${CONFIGURATION}" \
     --build-arg "APP_IMAGE_TAG_CODE=${OCELOT_VERSION}-code" \
@@ -33,7 +33,7 @@ docker build --target branded \
 docker build --target branded \
     -t "${DOCKERHUB_ORGANISATION}/webapp-branded:latest" \
     -t "${DOCKERHUB_ORGANISATION}/webapp-branded:${OCELOT_VERSION}" \
-    -t "${DOCKERHUB_ORGANISATION}/webapp-branded:${BRANDED_VERSION}" \
+    -t "${DOCKERHUB_ORGANISATION}/webapp-branded:${BUILD_VERSION}" \
     -f "${SCRIPT_DIR}/src/docker/webapp.Dockerfile" \
     --build-arg "CONFIGURATION=${CONFIGURATION}" \
     --build-arg "APP_IMAGE_TAG_CODE=${OCELOT_VERSION}-code" \
@@ -44,7 +44,7 @@ docker build --target branded \
 docker build --target branded \
     -t "${DOCKERHUB_ORGANISATION}/maintenance-branded:latest" \
     -t "${DOCKERHUB_ORGANISATION}/maintenance-branded:${OCELOT_VERSION}" \
-    -t "${DOCKERHUB_ORGANISATION}/maintenance-branded:${BRANDED_VERSION}" \
+    -t "${DOCKERHUB_ORGANISATION}/maintenance-branded:${BUILD_VERSION}" \
     -f "${SCRIPT_DIR}/src/docker/maintenance.Dockerfile" \
     --build-arg "CONFIGURATION=${CONFIGURATION}" \
     --build-arg "APP_IMAGE_TAG_CODE=${OCELOT_VERSION}-code" \