diff --git a/admin/libhelm.sh b/admin/libhelm.sh
index be90e64a..712efbc5 100644
--- a/admin/libhelm.sh
+++ b/admin/libhelm.sh
@@ -3,6 +3,7 @@
 # Simulate well-known CRDs being available
 API_VERSIONS="-a monitoring.coreos.com/v1 -a snapshot.storage.k8s.io/v1 -a policy/v1/PodDisruptionBudget -a apiregistration.k8s.io/v1"
 LOCAL_DEV=${LOCAL_DEV:-""}
+ENV_VALUES=""
 
 export HELM_SECRETS_BACKEND="vals"
 
diff --git a/charts/kubezero-ci/values.yaml b/charts/kubezero-ci/values.yaml
index ef13c4cb..1fffe8ba 100644
--- a/charts/kubezero-ci/values.yaml
+++ b/charts/kubezero-ci/values.yaml
@@ -289,7 +289,7 @@ trivy:
   #tag: 0.57.0
   persistence:
     enabled: true
-    size: 1Gi
+    size: 2Gi
   rbac:
     create: false
 
diff --git a/charts/kubezero/templates/telemetry.yaml b/charts/kubezero/templates/telemetry.yaml
index e11399a1..02bb43c5 100644
--- a/charts/kubezero/templates/telemetry.yaml
+++ b/charts/kubezero/templates/telemetry.yaml
@@ -61,8 +61,10 @@ opensearch:
   {{- toYaml . | nindent 2 }}
   {{- end }}
 
-  serviceMonitor:
-    enabled: {{ .Values.metrics.enabled }}
+# Disabled until upstream made up their mind
+# https://github.com/opensearch-project/technical-steering/issues/35
+# serviceMonitor:
+#   enabled: {{ .Values.metrics.enabled }}
 {{- end }}
 
 {{- if index .Values "telemetry" "opensearch-dashboards" }}
@@ -71,8 +73,10 @@ opensearch-dashboards:
   {{- toYaml . | nindent 2 }}
   {{- end }}
 
-  serviceMonitor:
-    enabled: {{ .Values.metrics.enabled }}
+# Disabled until upstream made up their mind
+# https://github.com/opensearch-project/technical-steering/issues/35
+# serviceMonitor:
+#   enabled: {{ .Values.metrics.enabled }}
 {{- end }}
 
 {{- end }}