diff --git a/common/values/values.badhouseplants.yaml b/common/values/values.badhouseplants.yaml
index a969676..0105932 100644
--- a/common/values/values.badhouseplants.yaml
+++ b/common/values/values.badhouseplants.yaml
@@ -1,3 +1,6 @@
 registry: registry.badhouseplants.net/containers
 registry_url: registry.badhouseplants.net
 main_ip: 195.201.249.91
+tools:
+  openebs:
+    enabled: true
diff --git a/common/values/values.etersoft.yaml b/common/values/values.etersoft.yaml
index 10f06f5..07d1a9d 100644
--- a/common/values/values.etersoft.yaml
+++ b/common/values/values.etersoft.yaml
@@ -1,3 +1,6 @@
 registry: registry.ru.badhouseplants.net/containers
 registry_url: registry.ru.badhouseplants.net
 main_ip: 91.232.225.63
+tools:
+  openebs:
+    enabled: false
diff --git a/helmfiles/system.yaml b/helmfiles/system.yaml
index 88edaf6..9dd9aa2 100644
--- a/helmfiles/system.yaml
+++ b/helmfiles/system.yaml
@@ -17,7 +17,10 @@ repositories:
     url: git+https://github.com/rancher/local-path-provisioner@deploy/chart?ref=master
   - name: kyverno
     url: https://kyverno.github.io/kyverno/
-
+  - name: vmware-tanzu
+    url: https://vmware-tanzu.github.io/helm-charts/
+  - name: openebs
+    url: https://openebs.github.io/openebs
 releases:
   - name: coredns
     chart: coredns/coredns
@@ -135,3 +138,22 @@ releases:
       - registry/cluster-mirror
     inherit:
       - template: common-values-tpl
+
+  - name: openebs
+    chart: openebs/openebs
+    condition: tools.openebs.enabled
+    namespace: kube-system
+    version: 4.2.0
+    inherit:
+      - template: common-values-tpl
+      - template: env-values
+
+  - name: velero
+    chart: vmware-tanzu/velero
+    namespace: velero
+    version: 8.5.0
+    condition: velero.enabled
+    inherit:
+      - template: common-values-tpl
+      - template: env-values
+      - template: env-secrets
diff --git a/installations/system/helmfile.yaml b/installations/system/helmfile.yaml
index b5577b9..43b852a 100644
--- a/installations/system/helmfile.yaml
+++ b/installations/system/helmfile.yaml
@@ -17,10 +17,6 @@ repositories:
     url: https://coredns.github.io/helm
   - name: cilium
     url: https://helm.cilium.io/
-  - name: vmware-tanzu
-    url: https://vmware-tanzu.github.io/helm-charts/
-  - name: openebs
-    url: https://openebs.github.io/openebs
   - name: local-path-provisioner
     url: git+https://github.com/rancher/local-path-provisioner@deploy/chart?ref=master
   - name: istio
diff --git a/values/badhouseplants/kube-system/namespaces/values.yaml b/values/badhouseplants/kube-system/namespaces/values.yaml
index eedb177..5616e22 100644
--- a/values/badhouseplants/kube-system/namespaces/values.yaml
+++ b/values/badhouseplants/kube-system/namespaces/values.yaml
@@ -5,6 +5,7 @@ namespaces:
   - name: kyverno
     defaultRegcred: true
   - name: velero
+    defaultRegcred: true
   - name: observability
   - name: databases
   - name: istio-system
diff --git a/values/badhouseplants/values.openebs.yaml b/values/badhouseplants/kube-system/openebs/values.yaml
similarity index 99%
rename from values/badhouseplants/values.openebs.yaml
rename to values/badhouseplants/kube-system/openebs/values.yaml
index ffc7b12..664c3da 100644
--- a/values/badhouseplants/values.openebs.yaml
+++ b/values/badhouseplants/kube-system/openebs/values.yaml
@@ -1,6 +1,7 @@
 localpv-provisioner:
   hostpathClass:
     isDefaultClass: true
+
 zfs-localpv:
   crds:
     zfsLocalPv:
diff --git a/values/badhouseplants/secrets.velero.yaml b/values/badhouseplants/velero/velero/secrets.yaml
similarity index 100%
rename from values/badhouseplants/secrets.velero.yaml
rename to values/badhouseplants/velero/velero/secrets.yaml
diff --git a/values/badhouseplants/values.velero.yaml b/values/badhouseplants/velero/velero/values.yaml
similarity index 92%
rename from values/badhouseplants/values.velero.yaml
rename to values/badhouseplants/velero/velero/values.yaml
index c523e57..7cbc1e8 100644
--- a/values/badhouseplants/values.velero.yaml
+++ b/values/badhouseplants/velero/velero/values.yaml
@@ -1,10 +1,3 @@
-initContainers:
-  - name: velero-plugin-for-aws
-    image: velero/velero-plugin-for-aws:v1.11.0
-    imagePullPolicy: IfNotPresent
-    volumeMounts:
-      - mountPath: /target
-        name: plugins
 configuration:
   logLevel: error
   repositoryMaintenanceJob:
@@ -17,7 +10,7 @@ configuration:
   backupStorageLocation:
     - name: hetzner
       provider: aws
-      plugin: velero/velero-plugin-for-aws:v1.11.0
+      plugin: velero/velero-plugin-for-aws:v1.11.1
       bucket: badhouseplants-backups
       accessMode: ReadWrite
       credential:
@@ -31,7 +24,7 @@ configuration:
         checksumAlgorithm: ""
     - name: etersoft
       provider: aws
-      plugin: velero/velero-plugin-for-aws:v1.11.0
+      plugin: velero/velero-plugin-for-aws:v1.11.1
       bucket: velero
       accessMode: ReadWrite
       credential:
diff --git a/values/common/kube-system/openebs/values.gotmpl b/values/common/kube-system/openebs/values.gotmpl
new file mode 100644
index 0000000..777b5a2
--- /dev/null
+++ b/values/common/kube-system/openebs/values.gotmpl
@@ -0,0 +1,6 @@
+global:
+  imageRegistry: {{ .Values.registry }}
+
+localpv-provisioner:
+  imagePullSecrets:
+    - name: regcred
diff --git a/values/common/velero/velero/values.gotmpl b/values/common/velero/velero/values.gotmpl
new file mode 100644
index 0000000..62501e3
--- /dev/null
+++ b/values/common/velero/velero/values.gotmpl
@@ -0,0 +1,26 @@
+{{- if not (env "HELMFILE_BOOTSTRAP") }}
+image:
+  repository: {{ .Values.registry }}/velero/velero
+  imagePullSecrets:
+    - regcred
+
+kubectl:
+  image:
+    repository: {{ .Values.registry }}/bitnami/kubectl
+
+initContainers:
+  - name: velero-plugin-for-aws
+    image: {{.Values.registry}}/velero/velero-plugin-for-aws:v1.11.1
+    imagePullPolicy: IfNotPresent
+    volumeMounts:
+      - mountPath: /target
+        name: plugins
+{{- else }}
+initContainers:
+  - name: velero-plugin-for-aws
+    image: velero/velero-plugin-for-aws:v1.11.1
+    imagePullPolicy: IfNotPresent
+    volumeMounts:
+      - mountPath: /target
+        name: plugins
+{{- end }}