diff --git a/delivery.yaml b/delivery.yaml
index 4fd62437e..7aa770094 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -92,12 +92,18 @@ pipeline:
       - desc: Build image
         cmd: |
           cd logical-backup
-          export TAG=$(git describe --tags --always --dirty)
+
+          if [ -z ${CDP_SOURCE_BRANCH} ]; then
+            IMAGE=${MULTI_ARCH_REGISTRY}/postgres-operator-logical-backup
+          else
+            IMAGE=${MULTI_ARCH_REGISTRY}/postgres-operator-logical-backup-test
+          fi
+
           docker buildx create --config /etc/cdp-buildkitd.toml --driver-opt network=host --bootstrap --use
           docker buildx build --platform linux/amd64,linux/arm64 \
-                              -t ${MULTI_ARCH_REGISTRY}/postgres-operator-logical-backup:${TAG} \
+                              -t ${MULTI_ARCH_REGISTRY}/postgres-operator-logical-backup:${CDP_BUILD_VERSION} \
                               --push .
 
           if [ -z ${CDP_SOURCE_BRANCH} ]; then
-            cdp-promote-image ${MULTI_ARCH_REGISTRY}/postgres-operator-logical-backup:${TAG}
+            cdp-promote-image ${IMAGE}:${CDP_BUILD_VERSION}
           fi