diff --git a/charts/kubezero-metrics/.helmignore b/charts/kubezero-metrics/.helmignore
index c85ebc47..e5a7f77c 100644
--- a/charts/kubezero-metrics/.helmignore
+++ b/charts/kubezero-metrics/.helmignore
@@ -26,4 +26,4 @@ README.md.gotmpl
 *.patch
 *.sh
 *.py
-configs
+jsonnet
diff --git a/charts/kubezero/bootstrap.sh b/charts/kubezero/bootstrap.sh
index 2b020dc9..fb71fbfa 100755
--- a/charts/kubezero/bootstrap.sh
+++ b/charts/kubezero/bootstrap.sh
@@ -64,7 +64,7 @@ function _crds() {
 
   # Only apply if there are actually any crds
   if [ -s $TMPDIR/crds.yaml ]; then
-    kubectl apply -f $TMPDIR/crds.yaml
+    kubectl apply -f $TMPDIR/crds.yaml --server-side
   fi
 }
 
diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml
index 5ee23941..4fd326b3 100644
--- a/charts/kubezero/values.yaml
+++ b/charts/kubezero/values.yaml
@@ -41,7 +41,7 @@ istio-ingress:
 metrics:
   enabled: false
   namespace: monitoring
-  targetRevision: 0.7.4
+  targetRevision: 0.8.0
   istio:
     grafana: {}
     prometheus: {}
@@ -49,7 +49,7 @@ metrics:
 logging:
   enabled: false
   namespace: logging
-  targetRevision: 0.8.0
+  targetRevision: 0.7.19
 
 argocd:
   enabled: false