diff --git a/manifests/function/elasticsearch/helmrelease.yaml b/manifests/function/elasticsearch/helmrelease.yaml
index 4ca967efc..4c294558b 100644
--- a/manifests/function/elasticsearch/helmrelease.yaml
+++ b/manifests/function/elasticsearch/helmrelease.yaml
@@ -10,7 +10,6 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: elasticsearch
-    interval: 1m
-  wait: false
+      interval: 1m
   timeout: 5m
   values: {}
diff --git a/manifests/function/grafana/helmrelease.yaml b/manifests/function/grafana/helmrelease.yaml
index acc5328bd..3765549ba 100644
--- a/manifests/function/grafana/helmrelease.yaml
+++ b/manifests/function/grafana/helmrelease.yaml
@@ -7,12 +7,10 @@ spec:
   interval: 5m
   chart:
     spec:
-      chart: grafana
       sourceRef:
         kind: HelmRepository
         name: grafana
-    version: 6.1.0
-    interval: 1m
+      interval: 1m
   timeout: 5m
   # Reference values at
   # https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml
diff --git a/manifests/function/kibana/helmrelease.yaml b/manifests/function/kibana/helmrelease.yaml
index da36c8e69..ca5254555 100644
--- a/manifests/function/kibana/helmrelease.yaml
+++ b/manifests/function/kibana/helmrelease.yaml
@@ -10,7 +10,6 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: kibana
-    interval: 1m
-  wait: false
+      interval: 1m
   timeout: 5m
   values: {}
diff --git a/manifests/function/kibana/replacements/versions.yaml b/manifests/function/kibana/replacements/versions.yaml
index 46d360d95..d66091dce 100644
--- a/manifests/function/kibana/replacements/versions.yaml
+++ b/manifests/function/kibana/replacements/versions.yaml
@@ -36,7 +36,7 @@ replacements:
     objref:
       kind: HelmRelease
       name: kibana
-    fieldrefs: ["{.spec.chart.version}"]
+    fieldrefs: ["{.spec.chart.spec.version}"]
 - source:
     objref:
       kind: VersionsCatalogue
diff --git a/manifests/function/kube-prometheus-stack/helmrelease.yaml b/manifests/function/kube-prometheus-stack/helmrelease.yaml
index faccc1e20..ca9be204c 100644
--- a/manifests/function/kube-prometheus-stack/helmrelease.yaml
+++ b/manifests/function/kube-prometheus-stack/helmrelease.yaml
@@ -10,7 +10,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: prometheus-community
-    interval: 1m
+      interval: 1m
   timeout: 5m
   # Reference values at
   # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml
diff --git a/manifests/function/logging-operator/helmrelease-logging.yaml b/manifests/function/logging-operator/helmrelease-logging.yaml
index db45b2d97..40ed891c0 100644
--- a/manifests/function/logging-operator/helmrelease-logging.yaml
+++ b/manifests/function/logging-operator/helmrelease-logging.yaml
@@ -10,7 +10,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: banzaicloud
-    interval: 1m
+      interval: 1m
   timeout: 5m
   # Reference values at
   # https://github.com/banzaicloud/logging-operator/blob/master/charts/logging-operator-logging/values.yaml
diff --git a/manifests/function/logging-operator/helmrelease-operator.yaml b/manifests/function/logging-operator/helmrelease-operator.yaml
index f183e491d..67ddaed0b 100644
--- a/manifests/function/logging-operator/helmrelease-operator.yaml
+++ b/manifests/function/logging-operator/helmrelease-operator.yaml
@@ -10,7 +10,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: banzaicloud
-    interval: 1m
+      interval: 1m
   timeout: 5m
   # Reference values at
   # https://github.com/banzaicloud/logging-operator/blob/master/charts/logging-operator/values.yaml
diff --git a/manifests/function/minio/helmrelease.yaml b/manifests/function/minio/helmrelease.yaml
index f2a1e07e8..9ee9ea492 100644
--- a/manifests/function/minio/helmrelease.yaml
+++ b/manifests/function/minio/helmrelease.yaml
@@ -10,8 +10,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: minio
-    interval: 1m
-  wait: false
+      interval: 1m
   timeout: 5m
   # Reference values at
   # https://github.com/minio/charts/blob/master/minio/values.yaml
diff --git a/manifests/function/prometheus-elasticsearch-exporter/helmrelease.yaml b/manifests/function/prometheus-elasticsearch-exporter/helmrelease.yaml
index ec50b677b..070f063e5 100644
--- a/manifests/function/prometheus-elasticsearch-exporter/helmrelease.yaml
+++ b/manifests/function/prometheus-elasticsearch-exporter/helmrelease.yaml
@@ -10,7 +10,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: prometheus-elasticsearch-exporter
-    interval: 1m
+      interval: 1m
   timeout: 5m
   # Reference values at
   # https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus-elasticsearch-exporter/values.yaml
diff --git a/manifests/function/thanos-operator/helmrelease.yaml b/manifests/function/thanos-operator/helmrelease.yaml
index bd1aa566c..1ad9cec2c 100644
--- a/manifests/function/thanos-operator/helmrelease.yaml
+++ b/manifests/function/thanos-operator/helmrelease.yaml
@@ -10,8 +10,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: thanos
-    interval: 1m
-  wait: false
+      interval: 1m
   timeout: 5m
   # Reference values at
   # https://github.com/banzaicloud/thanos-operator/blob/master/charts/thanos-operator/values.yaml
diff --git a/manifests/site/test-site/target/workload/kustomization.yaml b/manifests/site/test-site/target/workload/kustomization.yaml
index e839e7b4f..7117db2f5 100644
--- a/manifests/site/test-site/target/workload/kustomization.yaml
+++ b/manifests/site/test-site/target/workload/kustomization.yaml
@@ -2,5 +2,5 @@ resources:
   - ../../../../type/airship-core/target/workload
   - ../catalogues
 transformers:
-  - ../../../../function/ingress/replacements
   - ./replacements
+  - ../../../../type/airship-core/target/workload/replacements