diff --git a/delivery.yaml b/delivery.yaml
index 1a6a6309..cf080778 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -19,7 +19,7 @@ pipeline:
       git diff --exit-code || exit 1
   - desc: Push docker image
     cmd: |
-      if [[ $CDP_TARGET_BRANCH != master && $CDP_PULL_REQUEST_NUMBER ]]; then
+      if [ -n "$CDP_PULL_REQUEST_NUMBER" ]; then
         IMAGE=registry-write.opensource.zalan.do/teapot/kube-ingress-aws-controller-test
         VERSION=$CDP_BUILD_VERSION
         IMAGE=$IMAGE VERSION=$VERSION make build.push
@@ -30,7 +30,7 @@ pipeline:
         make build.linux.amd64 build.linux.arm64
 
         docker buildx create --config /etc/cdp-buildkitd.toml --driver-opt network=host --bootstrap --use
-        docker buildx build --rm --build-arg BASE_IMAGE=container-registry.zalando.net/library/alpine-3.13:latest -t "${IMAGE}:${CDP_BUILD_VERSION}" --platform linux/amd64,linux/arm64 --push .
+        docker buildx build --rm --build-arg BASE_IMAGE=container-registry.zalando.net/library/alpine-3:latest -t "${IMAGE}:${CDP_BUILD_VERSION}" --platform linux/amd64,linux/arm64 --push .
       fi
 
 - id: buildprod
@@ -68,7 +68,7 @@ pipeline:
       make build.linux.amd64 build.linux.arm64
       IMAGE=container-registry-test.zalando.net/teapot/kube-ingress-aws-controller
       docker buildx create --config /etc/cdp-buildkitd.toml --driver-opt network=host --bootstrap --use
-      docker buildx build --rm --build-arg BASE_IMAGE=container-registry.zalando.net/library/alpine-3.13:latest -t "${IMAGE}:${VERSION}" --platform linux/amd64,linux/arm64 --push .
+      docker buildx build --rm --build-arg BASE_IMAGE=container-registry.zalando.net/library/alpine-3:latest -t "${IMAGE}:${VERSION}" --platform linux/amd64,linux/arm64 --push .
       cdp-promote-image "${IMAGE}:${VERSION}"
 
       echo "create release page"