diff --git a/deployment/chainloop/Chart.yaml b/deployment/chainloop/Chart.yaml
index 13ec470ff..f0660dabc 100644
--- a/deployment/chainloop/Chart.yaml
+++ b/deployment/chainloop/Chart.yaml
@@ -3,7 +3,7 @@ name: chainloop
 description: Chainloop is an open source software supply chain control plane, a single source of truth for artifacts plus a declarative attestation crafting process.
 
 type: application
-version: v0.8.98
+version: v0.8.98-r1
 appVersion: v0.8.98
 
 dependencies:
diff --git a/deployment/chainloop/values.yaml b/deployment/chainloop/values.yaml
index 00a994a15..47ea1e7ea 100644
--- a/deployment/chainloop/values.yaml
+++ b/deployment/chainloop/values.yaml
@@ -382,8 +382,16 @@ controlplane:
   ## @param controlplane.resources.limits Container resource limits
   ## @param controlplane.resources.requests Container resource requests
   resources:
-    limits: {}
-    requests: {}
+    # GKE auto-pilot min
+    # https://cloud.google.com/kubernetes-engine/docs/concepts/autopilot-resource-requests#min-max-requests
+    cpu: 250m
+    memory: 512Mi
+    requests:
+      cpu: 250m
+      memory: 512Mi
+    limits:
+      cpu: 250m
+      memory: 512Mi
 
   ## Deployment autoscaling
   ## @param controlplane.autoscaling.enabled Enable deployment autoscaling
@@ -547,8 +555,16 @@ cas:
   ## @param cas.resources.limits Container resource limits
   ## @param cas.resources.requests Container resource requests
   resources:
-    limits: {}
-    requests: {}
+    # GKE auto-pilot min
+    # https://cloud.google.com/kubernetes-engine/docs/concepts/autopilot-resource-requests#min-max-requests
+    cpu: 250m
+    memory: 512Mi
+    requests:
+      cpu: 250m
+      memory: 512Mi
+    limits:
+      cpu: 250m
+      memory: 512Mi
 
   ## Deployment autoscaling
   ## @param cas.autoscaling.enabled Enable deployment autoscaling