diff --git a/.buildkite/pipeline.cloud-cleanup.yml b/.buildkite/pipeline.cloud-cleanup.yml
index 26e759cbdd..418fa8f702 100644
--- a/.buildkite/pipeline.cloud-cleanup.yml
+++ b/.buildkite/pipeline.cloud-cleanup.yml
@@ -19,6 +19,14 @@ steps:
         - label: "False"
           value: "false"
       default: "true"
+    - select: "DRY_RUN (Deprecated step)"
+      key: "DRY_RUN_DEPRECATED"
+      options:
+        - label: "True"
+          value: "true"
+        - label: "False"
+          value: "false"
+      default: "true"
     if: "build.source == 'ui'"
 
   - wait: ~
@@ -42,7 +50,7 @@ steps:
     command: ".buildkite/scripts/cloud-cleanup.sh"
     env:
       RESOURCE_RETENTION_PERIOD: "24 hours"
-      DRY_RUN: "${DRY_RUN:-true}"
+      DRY_RUN: "${DRY_RUN_DEPRECATED:-true}"
     agents:
       provider: "gcp" # this step requires docker
 
diff --git a/.buildkite/scripts/cloud-cleanup-oidc.sh b/.buildkite/scripts/cloud-cleanup-oidc.sh
index 25716c021d..0120eb9392 100755
--- a/.buildkite/scripts/cloud-cleanup-oidc.sh
+++ b/.buildkite/scripts/cloud-cleanup-oidc.sh
@@ -30,14 +30,21 @@ DRY_RUN="$(buildkite-agent meta-data get DRY_RUN --default "${DRY_RUN:-"true"}")
 resources_to_delete=0
 
 COMMAND="validate"
+redshift_message=""
 if [[ "${DRY_RUN}" != "true" ]]; then
     # TODO: to be changed to "destroy --confirm" once it can be tested
     # that filters work as expected
     COMMAND="plan"
+    redshift_message=" - stale redshift clusters will be deleted"
 else
     COMMAND="plan"
 fi
 
+buildkite-agent annotate \
+  "[${BUILDKITE_STEP_KEY}] Running DRY_RUN (${DRY_RUN}) using cloud-reaper command \"${COMMAND}\"${redshift_message}" \
+  --context "ctx-cloud-reaper-info" \
+  --style "info"
+
 any_resources_to_delete() {
     local file=$1
     local number=0
@@ -45,6 +52,16 @@ any_resources_to_delete() {
     # ⇒ Loading configuration...
     # ✓ Succeeded to load configuration
     # Scanning resources... ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 100% 0:00:00
+    
+    # FIXME:: When running with "destroy --confirm" there could be more lines.
+    # In the case, there is nothing to delete, there is one more line:
+    # ⇒ Nothing to destroy !
+    # but there are no examples when resources are deleted to add the required logic
+    if [[ "${DRY_RUN}" == false ]] ; then
+        if tail -n 1 ${file} | grep -q "Nothing to destroy" ; then
+            return 1
+        fi
+    fi
     number=$(tail -n +4 "${file}" | wc -l)
     if [ "${number}" -eq 0 ]; then
         return 1
@@ -86,7 +103,7 @@ cloud_reaper_aws() {
     echo "--- Configuring ephemeral user"
     create_aws_ephemeral_user
 
-    echo "Validating configuration"
+    echo "--- Validating configuration"
     docker run --rm -v "$(pwd)/.buildkite/configs/cleanup.aws.yml":/etc/cloud-reaper/config.yml \
       -e AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID_EPHEMERAL" \
       -e AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY_EPHEMERAL" \
@@ -98,7 +115,7 @@ cloud_reaper_aws() {
           --config /etc/cloud-reaper/config.yml \
           validate
 
-    echo "Scanning resources"
+    echo "--- Scanning resources"
     docker run --rm -v "$(pwd)/.buildkite/configs/cleanup.aws.yml":/etc/cloud-reaper/config.yml \
       -e AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID_EPHEMERAL" \
       -e AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY_EPHEMERAL" \
diff --git a/.buildkite/scripts/cloud-cleanup.sh b/.buildkite/scripts/cloud-cleanup.sh
index 84b98c13ab..2aaa8a0ae2 100644
--- a/.buildkite/scripts/cloud-cleanup.sh
+++ b/.buildkite/scripts/cloud-cleanup.sh
@@ -25,19 +25,26 @@ export DELETE_RESOURCES_BEFORE_DATE
 
 CLOUD_REAPER_IMAGE="${DOCKER_REGISTRY}/observability-ci/cloud-reaper:0.3.0"
 
-DRY_RUN="$(buildkite-agent meta-data get DRY_RUN --default "${DRY_RUN:-"true"}")"
+DRY_RUN="$(buildkite-agent meta-data get DRY_RUN_DEPRECATED --default "${DRY_RUN:-"true"}")"
 
 resources_to_delete=0
 
 COMMAND="validate"
+redshift_message=""
 if [[ "${DRY_RUN}" != "true" ]]; then
     # TODO: to be changed to "destroy --confirm" once it can be tested
     # that filters work as expected
     COMMAND="plan"
+    redshift_message=" - stale redshift clusters will be deleted"
 else
     COMMAND="plan"
 fi
 
+buildkite-agent annotate \
+  "[${BUILDKITE_STEP_KEY}] Running DRY_RUN (${DRY_RUN}) using cloud-reaper command \"${COMMAND}\"${redshift_message}" \
+  --context "ctx-cloud-reaper-info-deprecated" \
+  --style "info"
+
 any_resources_to_delete() {
     local file=$1
     local number=0
@@ -45,6 +52,16 @@ any_resources_to_delete() {
     # ⇒ Loading configuration...
     # ✓ Succeeded to load configuration
     # Scanning resources... ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 100% 0:00:00
+
+    # FIXME:: When running with "destroy --confirm" command there could be more lines.
+    # In the case, there is nothing to delete, there is one more line:
+    # ⇒ Nothing to destroy !
+    # but there are no examples when resources are deleted to add the required logic
+    if [[ "${DRY_RUN}" == false ]] ; then
+        if tail -n 1 ${file} | grep -q "Nothing to destroy" ; then
+            return 1
+        fi
+    fi
     number=$(tail -n +4 "${file}" | wc -l)
     if [ "${number}" -eq 0 ]; then
         return 1
@@ -53,7 +70,7 @@ any_resources_to_delete() {
 }
 
 cloud_reaper_aws() {
-    echo "Validating configuration"
+    echo "--- Validating configuration"
     docker run --rm -v "$(pwd)/.buildkite/configs/cleanup.aws.yml":/etc/cloud-reaper/config.yml \
       -e AWS_SECRET_ACCESS_KEY="${ELASTIC_PACKAGE_AWS_SECRET_KEY}" \
       -e AWS_ACCESS_KEY_ID="${ELASTIC_PACKAGE_AWS_ACCESS_KEY}" \
@@ -64,7 +81,7 @@ cloud_reaper_aws() {
           --config /etc/cloud-reaper/config.yml \
           validate
 
-    echo "Scanning resources"
+    echo "--- Scanning resources"
     docker run --rm -v "$(pwd)/.buildkite/configs/cleanup.aws.yml":/etc/cloud-reaper/config.yml \
       -e AWS_SECRET_ACCESS_KEY="${ELASTIC_PACKAGE_AWS_SECRET_KEY}" \
       -e AWS_ACCESS_KEY_ID="${ELASTIC_PACKAGE_AWS_ACCESS_KEY}" \