diff --git a/post-upgrade-2-5-1-chart/templates/installer-post-upgrade-2-5-1.yaml b/post-upgrade-2-5-1-chart/templates/installer-post-upgrade-2-5-1.yaml
index d161448..f00926f 100644
--- a/post-upgrade-2-5-1-chart/templates/installer-post-upgrade-2-5-1.yaml
+++ b/post-upgrade-2-5-1-chart/templates/installer-post-upgrade-2-5-1.yaml
@@ -58,14 +58,14 @@ spec:
             - |
               set -euo pipefail
 
-              echo "Step 4) Add & update 'marketplace' repo ..."
+              echo "Step 1) Add & update 'marketplace' repo ..."
               helm repo add marketplace https://marketplace.krateo.io
               helm repo update marketplace
 
-              echo "Step 5) Uninstall old 'portal' release if present ..."
+              echo "Step 2) Uninstall old 'portal' release if present ..."
               helm uninstall portal -n {{ .Release.Namespace }} || true
 
-              echo "Step 6) Install 'portal' from marketplace ..."
+              echo "Step 3) Install 'portal' from marketplace ..."
               helm install portal marketplace/portal \
                 -n {{ .Release.Namespace }} \
                 --version 1.0.0 \
diff --git a/pre-upgrade-2-5-0-chart/templates/installer-pre-upgrade-2-5-0.yaml b/pre-upgrade-2-5-0-chart/templates/installer-pre-upgrade-2-5-0.yaml
index bc00485..e2d068d 100644
--- a/pre-upgrade-2-5-0-chart/templates/installer-pre-upgrade-2-5-0.yaml
+++ b/pre-upgrade-2-5-0-chart/templates/installer-pre-upgrade-2-5-0.yaml
@@ -58,29 +58,34 @@ spec:
             - |
               set -euo pipefail
 
-              echo "Annotate/label CRD compositionreferences.resourcetrees.krateo.io..."
+              echo "Step 1) Annotate CRD compositionreferences.resourcetrees.krateo.io..."
               kubectl annotate crd compositionreferences.resourcetrees.krateo.io \
                 meta.helm.sh/release-name=resource-tree-handler \
                 meta.helm.sh/release-namespace={{ .Release.Namespace }} \
                 app.kubernetes.io/managed-by=Helm \
-                --overwrite
+                --overwrite \
+                || echo "WARN: Failed to annotate CRD compositionreferences.resourcetrees.krateo.io"
 
+              echo "Step 2) Label CRD compositionreferences.resourcetrees.krateo.io..."
               kubectl label crd compositionreferences.resourcetrees.krateo.io \
-                app.kubernetes.io/managed-by=Helm --overwrite
+                app.kubernetes.io/managed-by=Helm --overwrite \
+                || echo "WARN: Failed to label CRD compositionreferences.resourcetrees.krateo.io"
 
-              echo "Annotate secret admin-password in {{ .Release.Namespace }}..."
+              echo "Step 3) Annotate secret admin-password in {{ .Release.Namespace }}..."
               kubectl annotate secret admin-password -n {{ .Release.Namespace }} \
                 meta.helm.sh/release-name=composable-portal-starter \
                 meta.helm.sh/release-namespace={{ .Release.Namespace }} \
                 app.kubernetes.io/managed-by=Helm \
-                --overwrite
+                --overwrite \
+                || echo "WARN: Failed to annotate secret admin-password"
 
-              echo "Annotate user admin in {{ .Release.Namespace }}..."
+              echo "Step 4) Annotate user admin in {{ .Release.Namespace }}..."
               kubectl annotate user admin -n {{ .Release.Namespace }} \
                 meta.helm.sh/release-name=composable-portal-starter \
                 meta.helm.sh/release-namespace={{ .Release.Namespace }} \
                 app.kubernetes.io/managed-by=Helm \
-                --overwrite
+                --overwrite \
+                || echo "WARN: Failed to annotate user admin"
 
-              echo "Pre-upgrade 2.5.0 job done ✅"
+              echo "Pre-upgrade 2.5.0 job done ✅ (errors above, if any, were non-blocking)"
 {{- end }}
\ No newline at end of file
diff --git a/pre-upgrade-2-5-1-chart/templates/installer-pre-upgrade-2-5-1.yaml b/pre-upgrade-2-5-1-chart/templates/installer-pre-upgrade-2-5-1.yaml
index 25d9dd9..987ba14 100644
--- a/pre-upgrade-2-5-1-chart/templates/installer-pre-upgrade-2-5-1.yaml
+++ b/pre-upgrade-2-5-1-chart/templates/installer-pre-upgrade-2-5-1.yaml
@@ -58,16 +58,18 @@ spec:
             - |
               set -euo pipefail
 
-              echo "Step 1) Annotate CRD ..."
+              echo "Step 1) Annotate CRD krateoplatformops.krateo.io..."
               kubectl annotate crd krateoplatformops.krateo.io \
                 meta.helm.sh/release-name=installer \
                 meta.helm.sh/release-namespace={{ .Release.Namespace }} \
                 app.kubernetes.io/managed-by=Helm \
-                --overwrite
+                --overwrite \
+                || echo "WARN: Failed to annotate CRD krateoplatformops.krateo.io"
 
-              echo "Step 2) Label CRD ..."
+              echo "Step 2) Label CRD krateoplatformops.krateo.io..."
               kubectl label crd krateoplatformops.krateo.io \
-                app.kubernetes.io/managed-by=Helm --overwrite
+                app.kubernetes.io/managed-by=Helm --overwrite \
+                || echo "WARN: Failed to label CRD krateoplatformops.krateo.io"
 
-              echo "Pre-upgrade 2.5.1 job done ✅"
+              echo "Pre-upgrade 2.5.1 job done ✅ (errors above, if any, were non-blocking)"
 {{- end }}
\ No newline at end of file