diff --git a/charts/kubezero-storage/Chart.yaml b/charts/kubezero-storage/Chart.yaml
index 659f1a27..0e3e8364 100644
--- a/charts/kubezero-storage/Chart.yaml
+++ b/charts/kubezero-storage/Chart.yaml
@@ -1,13 +1,15 @@
 apiVersion: v2
 name: kubezero-storage
-description: KubeZero umbrella chart for all things storage, eg. openEBS-lvm
+description: KubeZero umbrella chart for all things storage incl. backup, eg. openEBS-lvm, gemini
 type: application
-version: 0.2.0
+version: 0.3.0
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
   - kubezero
   - gemini
+  - openEBS
+  - lvm
 maintainers:
   - name: Quarky9
 dependencies:
@@ -15,4 +17,8 @@ dependencies:
     version: 0.8.0
     repository: https://openebs.github.io/lvm-localpv
     condition: lvm-localpv.enabled
+  - name: gemini
+    version: 0.0.7
+    condition: gemini.enabled
+    # repository: https://charts.fairwinds.com/stable
 kubeVersion: ">= 1.18.0"
diff --git a/charts/kubezero-timecapsule/charts/gemini/Chart.yaml b/charts/kubezero-storage/charts/gemini/Chart.yaml
similarity index 92%
rename from charts/kubezero-timecapsule/charts/gemini/Chart.yaml
rename to charts/kubezero-storage/charts/gemini/Chart.yaml
index 5d099a2f..bc0a550c 100644
--- a/charts/kubezero-timecapsule/charts/gemini/Chart.yaml
+++ b/charts/kubezero-storage/charts/gemini/Chart.yaml
@@ -6,4 +6,4 @@ maintainers:
 - email: robertb@fairwinds.com
   name: rbren
 name: gemini
-version: 0.0.6
+version: 0.0.7
diff --git a/charts/kubezero-timecapsule/charts/gemini/README.md b/charts/kubezero-storage/charts/gemini/README.md
similarity index 100%
rename from charts/kubezero-timecapsule/charts/gemini/README.md
rename to charts/kubezero-storage/charts/gemini/README.md
diff --git a/charts/kubezero-timecapsule/charts/gemini/README.md.gotmpl b/charts/kubezero-storage/charts/gemini/README.md.gotmpl
similarity index 100%
rename from charts/kubezero-timecapsule/charts/gemini/README.md.gotmpl
rename to charts/kubezero-storage/charts/gemini/README.md.gotmpl
diff --git a/charts/kubezero-timecapsule/charts/gemini/ci/test-values.yaml b/charts/kubezero-storage/charts/gemini/ci/test-values.yaml
similarity index 100%
rename from charts/kubezero-timecapsule/charts/gemini/ci/test-values.yaml
rename to charts/kubezero-storage/charts/gemini/ci/test-values.yaml
diff --git a/charts/kubezero-timecapsule/charts/gemini/logo.png b/charts/kubezero-storage/charts/gemini/logo.png
similarity index 100%
rename from charts/kubezero-timecapsule/charts/gemini/logo.png
rename to charts/kubezero-storage/charts/gemini/logo.png
diff --git a/charts/kubezero-timecapsule/charts/gemini/templates/NOTES.txt b/charts/kubezero-storage/charts/gemini/templates/NOTES.txt
similarity index 100%
rename from charts/kubezero-timecapsule/charts/gemini/templates/NOTES.txt
rename to charts/kubezero-storage/charts/gemini/templates/NOTES.txt
diff --git a/charts/kubezero-timecapsule/charts/gemini/templates/_helpers.tpl b/charts/kubezero-storage/charts/gemini/templates/_helpers.tpl
similarity index 100%
rename from charts/kubezero-timecapsule/charts/gemini/templates/_helpers.tpl
rename to charts/kubezero-storage/charts/gemini/templates/_helpers.tpl
diff --git a/charts/kubezero-timecapsule/charts/gemini/templates/deployment.yaml b/charts/kubezero-storage/charts/gemini/templates/deployment.yaml
similarity index 100%
rename from charts/kubezero-timecapsule/charts/gemini/templates/deployment.yaml
rename to charts/kubezero-storage/charts/gemini/templates/deployment.yaml
diff --git a/charts/kubezero-timecapsule/charts/gemini/templates/rbac.yaml b/charts/kubezero-storage/charts/gemini/templates/rbac.yaml
similarity index 100%
rename from charts/kubezero-timecapsule/charts/gemini/templates/rbac.yaml
rename to charts/kubezero-storage/charts/gemini/templates/rbac.yaml
diff --git a/charts/kubezero-timecapsule/charts/gemini/templates/test_crd.yaml b/charts/kubezero-storage/charts/gemini/templates/test_crd.yaml
similarity index 100%
rename from charts/kubezero-timecapsule/charts/gemini/templates/test_crd.yaml
rename to charts/kubezero-storage/charts/gemini/templates/test_crd.yaml
diff --git a/charts/kubezero-timecapsule/charts/gemini/values.yaml b/charts/kubezero-storage/charts/gemini/values.yaml
similarity index 100%
rename from charts/kubezero-timecapsule/charts/gemini/values.yaml
rename to charts/kubezero-storage/charts/gemini/values.yaml
diff --git a/charts/kubezero-timecapsule/run-on-controller.patch b/charts/kubezero-storage/gemini.patch
similarity index 100%
rename from charts/kubezero-timecapsule/run-on-controller.patch
rename to charts/kubezero-storage/gemini.patch
diff --git a/charts/kubezero-storage/templates/lvm-storageclass.yaml b/charts/kubezero-storage/templates/lvm-storageclass.yaml
index fb419cea..d55dcd57 100644
--- a/charts/kubezero-storage/templates/lvm-storageclass.yaml
+++ b/charts/kubezero-storage/templates/lvm-storageclass.yaml
@@ -1,8 +1,9 @@
+{{- if index .Values "lvm-localpv" "enabled" }}
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: openebs-lvm
-  {{- if .Values.storageClass.default }}
+  {{- if index .Values "lvm-localpv" "storageClass" "default" }}
   annotations:
     storageclass.kubernetes.io/is-default-class: "true"
   {{- end }}
@@ -10,6 +11,7 @@ volumeBindingMode: WaitForFirstConsumer
 reclaimPolicy: Delete
 parameters:
   storage: lvm
-  vgpattern: {{ default "openebs.*" .Values.storageClass.vgpattern }}
+  vgpattern: {{ default "openebs.*" ( index .Values "lvm-localpv" "storageClass" "vgpattern") }}
   fsType: xfs
 provisioner: local.csi.openebs.io
+{{- end }}
diff --git a/charts/kubezero-storage/update.sh b/charts/kubezero-storage/update.sh
index b6a5126f..3750e419 100755
--- a/charts/kubezero-storage/update.sh
+++ b/charts/kubezero-storage/update.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 set -ex
 
-export VERSION=2.11.2
+# Gemini
+rm -rf charts/gemini
+helm pull fairwinds-stable/gemini --untar --untardir charts
 
-#rm -rf charts/gemini
-#helm pull fairwinds-stable/gemini --untar --untardir charts
-
-# Patch for istiod to control plane
-#patch -p0 -i run-on-controller.patch --no-backup-if-mismatch
+# Patch to run gemini on controller nodes
+patch -p0 -i gemini.patch --no-backup-if-mismatch
diff --git a/charts/kubezero-storage/values.yaml b/charts/kubezero-storage/values.yaml
index 22ecac7f..a7997c82 100644
--- a/charts/kubezero-storage/values.yaml
+++ b/charts/kubezero-storage/values.yaml
@@ -1,5 +1,5 @@
 lvm-localpv:
-  enabled: true
+  enabled: false
 
   lvmNode:
     nodeSelector:
@@ -16,6 +16,18 @@ lvm-localpv:
     nodeSelector:
       node-role.kubernetes.io/master: ""
 
-storageClass:
-  vgpattern: ""
-  default: true
+  storageClass:
+    vgpattern: ""
+    default: false
+
+gemini:
+  enabled: false
+  # verbosity: 1
+
+  resources:
+    requests:
+      memory: 32Mi
+      cpu: 20m
+    limits:
+      memory: 128Mi
+      cpu: 400m
diff --git a/charts/kubezero-timecapsule/Chart.yaml b/charts/kubezero-timecapsule/Chart.yaml
deleted file mode 100644
index 85de2fd4..00000000
--- a/charts/kubezero-timecapsule/Chart.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: v2
-name: kubezero-timecapsule
-description: KubeZero umbrella chart for all things backup
-type: application
-version: 0.1.0
-home: https://kubezero.com
-icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
-keywords:
-  - kubezero
-  - gemini
-maintainers:
-  - name: Quarky9
-dependencies:
-  - name: gemini
-    version: 0.0.6
-    # repository: https://charts.fairwinds.com/stable
-kubeVersion: ">= 1.18.0"
diff --git a/charts/kubezero-timecapsule/README.md b/charts/kubezero-timecapsule/README.md
deleted file mode 100644
index 9940ea4b..00000000
--- a/charts/kubezero-timecapsule/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# kubezero-timecapsule
-
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
-
-KubeZero umbrella chart for all things backup
-
-**Homepage:** <https://kubezero.com>
-
-## Maintainers
-
-| Name | Email | Url |
-| ---- | ------ | --- |
-| Quarky9 |  |  |
-
-## Requirements
-
-Kubernetes: `>= 1.18.0`
-
-| Repository | Name | Version |
-|------------|------|---------|
-|  | gemini | 0.0.6 |
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| gemini.resources.limits.cpu | string | `"400m"` |  |
-| gemini.resources.limits.memory | string | `"128Mi"` |  |
-| gemini.resources.requests.cpu | string | `"20m"` |  |
-| gemini.resources.requests.memory | string | `"32Mi"` |  |
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
diff --git a/charts/kubezero-timecapsule/update.sh b/charts/kubezero-timecapsule/update.sh
deleted file mode 100755
index 3817ad90..00000000
--- a/charts/kubezero-timecapsule/update.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -ex
-
-export VERSION=0.0.6
-
-rm -rf charts/gemini
-helm pull fairwinds-stable/gemini --untar --untardir charts
-
-# Patch for istiod to control plane
-patch -p0 -i run-on-controller.patch --no-backup-if-mismatch
diff --git a/charts/kubezero-timecapsule/values.yaml b/charts/kubezero-timecapsule/values.yaml
deleted file mode 100644
index 3fe4cfb3..00000000
--- a/charts/kubezero-timecapsule/values.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-gemini:
-  #image:
-  #  tag: "0.1.1"
-
-  # verbosity: 1
-
-  resources:
-    requests:
-      memory: 32Mi
-      cpu: 20m
-    limits:
-      memory: 128Mi
-      cpu: 400m