diff --git a/helm/maestro/Chart.yaml b/helm/maestro/Chart.yaml
index 0b37f93..44b7ce4 100644
--- a/helm/maestro/Chart.yaml
+++ b/helm/maestro/Chart.yaml
@@ -2,16 +2,16 @@ apiVersion: v2
 name: maestro-stack
 description: Umbrella chart for Maestro Server and Agent deployment
 type: application
-version: 0.1.0
+version: 0.1.1
 appVersion: "0.0.0-dev"
 
 dependencies:
   - name: maestro-server
-    version: "0.1.0"
+    version: "0.1.1"
     repository: "git+https://github.com/openshift-online/maestro@charts/maestro-server?ref=main"
     alias: server
   - name: maestro-agent
-    version: "0.1.0"
+    version: "0.1.1"
     repository: "git+https://github.com/openshift-online/maestro@charts/maestro-agent?ref=main"
     alias: agent
     condition: agent.enabled
diff --git a/helm/maestro/values.yaml b/helm/maestro/values.yaml
index 6449a42..8540011 100644
--- a/helm/maestro/values.yaml
+++ b/helm/maestro/values.yaml
@@ -31,6 +31,8 @@ server:
 
   # Embedded PostgreSQL for development/demo
   postgresql:
+    podAnnotations:
+      cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
     enabled: true
     database:
       name: maestro
@@ -44,6 +46,8 @@ server:
 
   # Embedded Mosquitto MQTT broker for development/demo
   mosquitto:
+    podAnnotations:
+      cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
     enabled: true
     service:
       name: maestro-mqtt
@@ -65,6 +69,9 @@ agent:
   enabled: true
   environment: production
 
+  podAnnotations:
+    cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
+
   consumerName: "cluster1"
   cloudeventsClientId: "cluster1-work-agent"