diff --git a/charts/aaisp-to-mqtt/.helmignore b/charts/aaisp-to-mqtt/.helmignore
deleted file mode 100644
index 50af031..0000000
--- a/charts/aaisp-to-mqtt/.helmignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/charts/aaisp-to-mqtt/Chart.yaml b/charts/aaisp-to-mqtt/Chart.yaml
deleted file mode 100644
index e4bb628..0000000
--- a/charts/aaisp-to-mqtt/Chart.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-appVersion: "0.2"
-description: Pulls data from the AAISP CHAOSv2 API into MQTT
-name: aaisp-to-mqtt
-version: 0.2.5
-keywords:
-  - aaisp
-  - mqtt
-home: https://github.com/nikdoof/aaisp-to-mqtt
-sources:
-  - https://hub.docker.com/r/nikdoof/aaisp-to-mqtt/
-  - https://github.com/natm/aaisp-to-mqtt
-maintainers:
-  - name: nikdoof
-    email: andy@tensixtyone.com
diff --git a/charts/aaisp-to-mqtt/ci/existingsecret-values.yaml b/charts/aaisp-to-mqtt/ci/existingsecret-values.yaml
deleted file mode 100644
index 6a84cd3..0000000
--- a/charts/aaisp-to-mqtt/ci/existingsecret-values.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-mqtt:
-  broker: localhost
-
-existingSecretName: aaisp-to-mqtt-secret
diff --git a/charts/aaisp-to-mqtt/ci/test-values.yaml b/charts/aaisp-to-mqtt/ci/test-values.yaml
deleted file mode 100644
index 3289abd..0000000
--- a/charts/aaisp-to-mqtt/ci/test-values.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-aaisp:
-  username: test1@a
-  password: TesttestTest
-
-mqtt:
-  broker: localhost
diff --git a/charts/aaisp-to-mqtt/templates/_helpers.tpl b/charts/aaisp-to-mqtt/templates/_helpers.tpl
deleted file mode 100644
index 23eef3b..0000000
--- a/charts/aaisp-to-mqtt/templates/_helpers.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "aaisp-to-mqtt.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "aaisp-to-mqtt.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "aaisp-to-mqtt.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "aaisp-to-mqtt.labels" -}}
-app.kubernetes.io/name: {{ include "aaisp-to-mqtt.name" . }}
-helm.sh/chart: {{ include "aaisp-to-mqtt.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "aaisp-to-mqtt.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "aaisp-to-mqtt.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
diff --git a/charts/aaisp-to-mqtt/templates/cronjob.yaml b/charts/aaisp-to-mqtt/templates/cronjob.yaml
deleted file mode 100644
index 3f7e9ce..0000000
--- a/charts/aaisp-to-mqtt/templates/cronjob.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
----
-apiVersion: batch/v1beta1
-kind: CronJob
-metadata:
-  name: {{ include "aaisp-to-mqtt.fullname" . }}-cronjob
-  {{- if .Values.deploymentAnnotations }}
-  annotations:
-    {{- range $key, $value := .Values.deploymentAnnotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "aaisp-to-mqtt.name" . }}
-    helm.sh/chart: {{ include "aaisp-to-mqtt.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ include "aaisp-to-mqtt.name" . }}
-spec:
-  schedule: {{ .Values.cronjob.schedule | quote }}
-  successfulJobsHistoryLimit: {{ .Values.cronjob.successfulJobsHistoryLimit }}
-  failedJobsHistoryLimit: {{ .Values.cronjob.failedJobsHistoryLimit }}
-  concurrencyPolicy: Forbid
-  {{- if .Values.cronjob.startingDeadlineSeconds }}
-  startingDeadlineSeconds: {{ .Values.cronjob.startingDeadlineSeconds }}
-  {{- end }}
-  jobTemplate:
-    spec:
-      backoffLimit: 0
-      template:
-        metadata:
-          labels:
-            app.kubernetes.io/name: {{ include "aaisp-to-mqtt.name" . }}
-            helm.sh/chart: {{ include "aaisp-to-mqtt.chart" . }}
-            app.kubernetes.io/instance: {{ .Release.Name }}
-            app.kubernetes.io/managed-by: {{ include "aaisp-to-mqtt.name" . }}
-        spec:
-          restartPolicy: Never
-          {{- if .Values.image.pullSecrets }}
-          imagePullSecrets:
-          {{- range .Values.image.pullSecrets }}
-            - name: {{ . }}
-          {{- end }}
-          {{- end }}
-          containers:
-          - name: {{ .Chart.Name }}
-            image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-            imagePullPolicy: {{ .Values.image.pullPolicy }}
-            resources:
-{{ toYaml .Values.resources | indent 16 }}
-            env:
-              - name: AAISP_USERNAME
-                valueFrom:
-                  secretKeyRef:
-                    name: {{ default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
-                    key: aaisp.username              
-              - name: AAISP_PASSWORD
-                valueFrom:
-                  secretKeyRef:
-                    name: {{ default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
-                    key: aaisp.password
-              - name: MQTT_BROKER
-                value: {{ .Values.mqtt.broker }}
-              - name: MQTT_PORT
-                value: "{{ default 1883 .Values.mqtt.port }}"
-            {{- if .Values.mqtt.authenticated }}
-              - name: MQTT_USERNAME
-                valueFrom:
-                  secretKeyRef:
-                    name: {{ default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
-                    key: mqtt.username           
-              - name: MQTT_PASSWORD
-                valueFrom:
-                  secretKeyRef:
-                    name: {{ default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
-                    key: mqtt.password
-            {{- end }}
-              - name: MQTT_TOPIC_PREFIX
-                value: {{ default "aaisp" .Values.mqtt.topicPrefix }}
-    {{- with .Values.nodeSelector }}
-          nodeSelector:
-{{ toYaml . | indent 12 }}
-    {{- end }}
-    {{- with .Values.affinity }}
-          affinity:
-{{ toYaml . | indent 12 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-          tolerations:
-{{ toYaml . | indent 12 }}:
-    {{- end }}
diff --git a/charts/aaisp-to-mqtt/templates/secrets.yaml b/charts/aaisp-to-mqtt/templates/secrets.yaml
deleted file mode 100644
index 48376eb..0000000
--- a/charts/aaisp-to-mqtt/templates/secrets.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-{{- if not (.Values.existingSecretName) }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: aaisp-to-mqtt-secret
-  labels:
-    app.kubernetes.io/name: {{ include "aaisp-to-mqtt.name" . }}
-    helm.sh/chart: {{ include "aaisp-to-mqtt.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ include "aaisp-to-mqtt.name" . }}
-type: Opaque
-data:
-  aaisp.username: {{ .Values.aaisp.username | b64enc }}
-  aaisp.password: {{ .Values.aaisp.password | b64enc }}
-  {{- if .Values.mqtt.authenticated }}
-  mqtt.username: {{ .Values.mqtt.username | b64enc }}
-  mqtt.password: {{ .Values.mqtt.password | b64enc }}
-  {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/charts/aaisp-to-mqtt/values.yaml b/charts/aaisp-to-mqtt/values.yaml
deleted file mode 100644
index 5db18ba..0000000
--- a/charts/aaisp-to-mqtt/values.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-# Default values for aaisp-to-mqtt.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  repository: nikdoof/aaisp-to-mqtt
-  tag: 0.2.3
-  pullPolicy: IfNotPresent
-  # imagePullSecrets: []
-
-nameOverride: ""
-fullnameOverride: ""
-
-## Use a pre-existing secret for login information
-##
-# existingSecretName: existing-secret
-
-## Connection details
-##
-aaisp: {}
-  # username: user1@a
-  # password: password
-
-mqtt:
-  # broker: localhost
-  port: 1883
-  authenticated: false
-  # username: kube
-  # password: kube
-  # topicPrefix: aaisp
-
-cronjob:
-  schedule: "*/10 * * * *"
-  successfulJobsHistoryLimit: 3
-  failedJobsHistoryLimit: 1
-  # startingDeadlineSeconds: 10
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
diff --git a/charts/calibre-web/.helmignore b/charts/calibre-web/.helmignore
deleted file mode 100644
index 46fd899..0000000
--- a/charts/calibre-web/.helmignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-# OWNERS file for Kubernetes
-OWNERS
diff --git a/charts/calibre-web/Chart.yaml b/charts/calibre-web/Chart.yaml
deleted file mode 100644
index 37f0f9f..0000000
--- a/charts/calibre-web/Chart.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-appVersion: 0.6.6-ls58
-description: A simple web viewer for Calibre libraries
-name: calibre-web
-version: 1.1.3
-keywords:
-  - calibre-web
-  - calibre
-home: https://github.com/janeczku/calibre-web
-icon: https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/calibre-web-icon.png
-sources:
-  - https://hub.docker.com/r/linuxserver/calibre-web/
-maintainers:
-  - name: nikdoof
-    email: andy@tensixtyone.com
diff --git a/charts/calibre-web/OWNERS b/charts/calibre-web/OWNERS
deleted file mode 100644
index 3c780cd..0000000
--- a/charts/calibre-web/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-approvers:
-- nikdoof
-reviewers:
-- nikdoof
\ No newline at end of file
diff --git a/charts/calibre-web/README.md b/charts/calibre-web/README.md
deleted file mode 100644
index 9aecb12..0000000
--- a/charts/calibre-web/README.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# calibre-web
-
-This is a helm chart for [calibre-web](https://calibre-web.com/) leveraging the [Linuxserver.io image](https://hub.docker.com/r/linuxserver/calibre-web/). This Chart is heavily based on the format used by [billimek](https://github.com/billimek/) for his collection of media related [charts](https://github.com/billimek/billimek-charts/).
-
-## TL;DR;
-
-```shell
-$ helm repo add nikdoof https://nikdoof.github.io/helm-charts/
-$ helm install calibre-web
-```
-
-## Installing the Chart
-
-To install the chart with the release name `my-release`:
-
-```console
-helm install --name my-release calibre-web
-```
-
-## Uninstalling the Chart
-
-To uninstall/delete the `my-release` deployment:
-
-```console
-helm delete my-release --purge
-```
-
-The command removes all the Kubernetes components associated with the chart and deletes the release.
-
-## Configuration
-
-The following tables lists the configurable parameters of the Sentry chart and their default values.
-
-| Parameter                  | Description                         | Default                                                 |
-|----------------------------|-------------------------------------|---------------------------------------------------------|
-| `image.repository`         | Image repository | `linuxserver/calibre-web` |
-| `image.tag`                | Image tag. Possible values listed [here](https://hub.docker.com/r/linuxserver/calibre-web/tags/).| `v2.1.39-ls32`|
-| `image.pullPolicy`         | Image pull policy | `IfNotPresent` |
-| `strategyType`             | Specifies the strategy used to replace old Pods by new ones | `Recreate` |
-| `timezone`                 | Timezone the calibre-web instance should run as, e.g. 'America/New_York' | `UTC` |
-| `puid`                     | process userID the calibre-web instance should run as | `1001` |
-| `pgid`                     | process groupID the calibre-web instance should run as | `1001` |
-  `dockerMods`               | Enable "Docker Mods" for the Calibre-Web container | `nil` |
-| `probes.liveness.initialDelaySeconds`  | Specify liveness `initialDelaySeconds` parameter for the deployment  | `60` |
-| `probes.liveness.failureThreshold`     | Specify liveness `failureThreshold` parameter for the deployment     | `5`  |
-| `probes.liveness.timeoutSeconds`       | Specify liveness `timeoutSeconds` parameter for the deployment       | `10` |
-| `probes.readiness.initialDelaySeconds` | Specify readiness `initialDelaySeconds` parameter for the deployment | `60` |
-| `probes.readiness.failureThreshold`    | Specify readiness `failureThreshold` parameter for the deployment    | `5`  |
-| `probes.readiness.timeoutSeconds`      | Specify readiness `timeoutSeconds` parameter for the deployment      | `10` |
-| `Service.type`          | Kubernetes service type for the calibre-web GUI | `ClusterIP` |
-| `Service.port`          | Kubernetes port where the calibre-web GUI is exposed| `8083` |
-| `Service.annotations`   | Service annotations for the calibre-web GUI | `{}` |
-| `Service.labels`        | Custom labels | `{}` |
-| `Service.loadBalancerIP` | Loadbalance IP for the calibre-web GUI | `{}` |
-| `Service.loadBalancerSourceRanges` | List of IP CIDRs allowed access to load balancer (if supported)      | None
-| `ingress.enabled`              | Enables Ingress | `false` |
-| `ingress.annotations`          | Ingress annotations | `{}` |
-| `ingress.labels`               | Custom labels                       | `{}`
-| `ingress.path`                 | Ingress path | `/` |
-| `ingress.hosts`                | Ingress accepted hostnames | `chart-example.local` |
-| `ingress.tls`                  | Ingress TLS configuration | `[]` |
-| `persistence.config.enabled`      | Use persistent volume to store configuration data | `true` |
-| `persistence.config.size`         | Size of persistent volume claim | `1Gi` |
-| `persistence.config.existingClaim`| Use an existing PVC to persist data | `nil` |
-| `persistence.config.subPath`  | Mount a sub directory of the persistent volume if set | `""` |
-| `persistence.config.storageClass` | Type of persistent volume claim | `-` |
-| `persistence.config.accessMode`  | Persistence access mode | `ReadWriteOnce` |
-| `persistence.config.skipuninstall`  | Do not delete the pvc upon helm uninstall | `false` |
-| `persistence.books.enabled`      | Use persistent volume to store books | `true` |
-| `persistence.books.size`         | Size of persistent volume claim | `1Gi` |
-| `persistence.books.existingClaim`| Use an existing PVC to persist data | `nil` |
-| `persistence.books.subPath`  | Mount a sub directory of the persistent volume if set | `""` |
-| `persistence.books.storageClass` | Type of persistent volume claim | `-` |
-| `persistence.books.accessMode`  | Persistence access mode | `ReadWriteOnce` |
-| `persistence.books.skipuninstall`  | Do not delete the pvc upon helm uninstall | `false` |
-| `persistence.extraExistingClaimMounts` | Optionally add multiple existing claims to the container | `[]` |
-| `resources`                | CPU/Memory resource requests/limits | `{}` |
-| `nodeSelector`             | Node labels for pod assignment | `{}` |
-| `tolerations`              | Toleration labels for pod assignment | `[]` |
-| `affinity`                 | Affinity settings for pod assignment | `{}` |
-| `podAnnotations`           | Key-value pairs to add as pod annotations  | `{}` |
-| `deploymentAnnotations`    | Key-value pairs to add as deployment annotations  | `{}` |
-
-Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
-
-```console
-helm install --name my-release \
-  --set timezone="America/New York" \
-    ./calibre-web
-```
-
-Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
-
-```console
-helm install --name my-release -f values.yaml ./calibre-web
-```
-
----
-**NOTE**
-
-If you get `Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...` it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
-
----
-
-Read through the [values.yaml](https://github.com/nikdoof/helm-charts/tree/master/charts/calibre-web/values.yaml) file. It has several commented out suggested values.
diff --git a/charts/calibre-web/templates/NOTES.txt b/charts/calibre-web/templates/NOTES.txt
deleted file mode 100644
index 9ba4a11..0000000
--- a/charts/calibre-web/templates/NOTES.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "calibre-web.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ include "calibre-web.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "calibre-web.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "calibre-web.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8083 to use your application"
-  kubectl port-forward $POD_NAME 8083:80
-{{- end }}
\ No newline at end of file
diff --git a/charts/calibre-web/templates/_helpers.tpl b/charts/calibre-web/templates/_helpers.tpl
deleted file mode 100644
index 3088b30..0000000
--- a/charts/calibre-web/templates/_helpers.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "calibre-web.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "calibre-web.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "calibre-web.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
diff --git a/charts/calibre-web/templates/books-pvc.yaml b/charts/calibre-web/templates/books-pvc.yaml
deleted file mode 100644
index f2ef3eb..0000000
--- a/charts/calibre-web/templates/books-pvc.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-{{- if and .Values.persistence.books.enabled (not .Values.persistence.books.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "calibre-web.fullname" . }}-books
-  {{- if .Values.persistence.books.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "calibre-web.name" . }}
-    helm.sh/chart: {{ include "calibre-web.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.books.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.books.size | quote }}
-{{- if .Values.persistence.books.storageClass }}
-{{- if (eq "-" .Values.persistence.books.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.books.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}
\ No newline at end of file
diff --git a/charts/calibre-web/templates/config-pvc.yaml b/charts/calibre-web/templates/config-pvc.yaml
deleted file mode 100644
index 699c1c2..0000000
--- a/charts/calibre-web/templates/config-pvc.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-{{- if and .Values.persistence.config.enabled (not .Values.persistence.config.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "calibre-web.fullname" . }}-config
-  {{- if .Values.persistence.config.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "calibre-web.name" . }}
-    helm.sh/chart: {{ include "calibre-web.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.config.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.config.size | quote }}
-{{- if .Values.persistence.config.storageClass }}
-{{- if (eq "-" .Values.persistence.config.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.config.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}
\ No newline at end of file
diff --git a/charts/calibre-web/templates/deployment.yaml b/charts/calibre-web/templates/deployment.yaml
deleted file mode 100644
index a8b24df..0000000
--- a/charts/calibre-web/templates/deployment.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "calibre-web.fullname" . }}
-  {{- if .Values.deploymentAnnotations }}
-  annotations:
-    {{- range $key, $value := .Values.deploymentAnnotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "calibre-web.name" . }}
-    helm.sh/chart: {{ include "calibre-web.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  replicas: 1
-  revisionHistoryLimit: 3
-  strategy:
-    type: {{ .Values.strategyType }}
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "calibre-web.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: {{ include "calibre-web.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-      {{- if .Values.podAnnotations }}
-      annotations:
-        {{- range $key, $value := .Values.podAnnotations }}
-        {{ $key }}: {{ $value | quote }}
-        {{- end }}
-      {{- end }}
-    spec:
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: 8083
-              protocol: TCP
-          livenessProbe:
-            tcpSocket:
-              port: http
-            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
-            failureThreshold: {{ .Values.probes.liveness.failureThreshold }}
-            timeoutSeconds: {{ .Values.probes.liveness.timeoutSeconds }}
-          readinessProbe:
-            tcpSocket:
-              port: http
-            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
-            failureThreshold: {{ .Values.probes.readiness.failureThreshold }}
-            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
-          env:
-            - name: TZ
-              value: "{{ .Values.timezone }}"
-            - name: PUID
-              value: "{{ .Values.puid }}"
-            - name: PGID
-              value: "{{ .Values.pgid }}"
-            {{- if .Values.dockerMods }}
-            - name: DOCKER_MODS
-              value: {{ .Values.dockerMods }}
-            {{- end }}
-          volumeMounts:
-            - mountPath: /config
-              name: config
-              {{- if .Values.persistence.config.subPath }}
-              subPath: "{{ .Values.persistence.config.subPath }}"
-              {{- end }}
-            - mountPath: /books
-              name: books
-            {{- if .Values.persistence.books.subPath }}
-              subPath: {{ .Values.persistence.books.subPath }}
-            {{- end }}
-            {{- range .Values.persistence.extraExistingClaimMounts }}
-            - name: {{ .name }}
-              mountPath: {{ .mountPath }}
-              readOnly: {{ .readOnly }}
-            {{- end }}              
-          resources:
-{{ toYaml .Values.resources | indent 12 }}
-      volumes:
-      - name: config
-      {{- if .Values.persistence.config.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ if .Values.persistence.config.existingClaim }}{{ .Values.persistence.config.existingClaim }}{{- else }}{{ template "calibre-web.fullname" . }}-config{{- end }}
-      {{- else }}
-        emptyDir: {}
-      {{ end }}
-      - name: books
-      {{- if .Values.persistence.books.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ if .Values.persistence.books.existingClaim }}{{ .Values.persistence.books.existingClaim }}{{- else }}{{ template "calibre-web.fullname" . }}-books{{- end }}
-      {{- else }}
-        emptyDir: {}
-      {{- end }}
-      {{- range .Values.persistence.extraExistingClaimMounts }}
-      - name: {{ .name }}
-        persistentVolumeClaim:
-          claimName: {{ .existingClaim }}
-      {{- end }}
-    {{- with .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}
diff --git a/charts/calibre-web/templates/ingress.yaml b/charts/calibre-web/templates/ingress.yaml
deleted file mode 100644
index c080eda..0000000
--- a/charts/calibre-web/templates/ingress.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "calibre-web.fullname" . -}}
-{{- $ingressPath := .Values.ingress.path -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    app.kubernetes.io/name: {{ include "calibre-web.name" . }}
-    helm.sh/chart: {{ include "calibre-web.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- with .Values.ingress.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if .Values.ingress.tls }}
-  tls:
-  {{- range .Values.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.ingress.hosts }}
-    - host: {{ . | quote }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: http
-  {{- end }}
-{{- end }}
diff --git a/charts/calibre-web/templates/service.yaml b/charts/calibre-web/templates/service.yaml
deleted file mode 100644
index 982f649..0000000
--- a/charts/calibre-web/templates/service.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "calibre-web.fullname" . }}
-  labels:
-    app.kubernetes.io/name: {{ include "calibre-web.name" . }}
-    helm.sh/chart: {{ include "calibre-web.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Values.service.labels }}
-{{ toYaml .Values.service.labels | indent 4 }}
-{{- end }}
-{{- with .Values.service.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }}
-  type: ClusterIP
-  {{- if .Values.service.clusterIP }}
-  clusterIP: {{ .Values.service.clusterIP }}
-  {{end}}
-{{- else if eq .Values.service.type "LoadBalancer" }}
-  type: {{ .Values.service.type }}
-  {{- if .Values.service.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
-  {{- end }}
-  {{- if .Values.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-{{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }}
-  {{- end -}}
-{{- else }}
-  type: {{ .Values.service.type }}
-{{- end }}
-{{- if .Values.service.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.service.externalIPs | indent 4 }}
-{{- end }}
-  {{- if .Values.service.externalTrafficPolicy }}
-  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
-  {{- end }}
-  ports:
-    - name: http
-      port: {{ .Values.service.port }}
-      protocol: TCP
-      targetPort: http
-{{ if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
-      nodePort: {{.Values.service.nodePort}}
-{{ end }}
-  selector:
-    app.kubernetes.io/name: {{ include "calibre-web.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    
\ No newline at end of file
diff --git a/charts/calibre-web/values.yaml b/charts/calibre-web/values.yaml
deleted file mode 100644
index c6822f8..0000000
--- a/charts/calibre-web/values.yaml
+++ /dev/null
@@ -1,140 +0,0 @@
-# Default values for calibre-web.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-image:
-  repository: linuxserver/calibre-web
-  tag: 0.6.6-ls58
-  pullPolicy: IfNotPresent
-
-# upgrade strategy type (e.g. Recreate or RollingUpdate)
-strategyType: Recreate
-
-# Probes configuration
-probes:
-  liveness:
-    initialDelaySeconds: 60
-    failureThreshold: 5
-    timeoutSeconds: 10
-  readiness:
-    initialDelaySeconds: 60
-    failureThreshold: 5
-    timeoutSeconds: 10
-
-nameOverride: ""
-fullnameOverride: ""
-
-timezone: UTC
-puid: 1001
-pgid: 1001
-
-## Configure docker_mods for this container. For x86 systems you can uncomment the following
-## and enable ebook conversion tools in calbire-web
-##
-# dockerMods: linuxserver/calibre-web:calibre
-
-service:
-  type: ClusterIP
-  port: 8083
-  ## Specify the nodePort value for the LoadBalancer and NodePort service types.
-  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
-  ##
-  # nodePort:
-  ## Provide any additional annotations which may be required. This can be used to
-  ## set the LoadBalancer service type to internal only.
-  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
-  ##
-  annotations: {}
-  labels: {}
-  ## Use loadBalancerIP to request a specific static IP,
-  ## otherwise leave blank
-  ##
-  loadBalancerIP:
-  # loadBalancerSourceRanges: []
-  ## Set the externalTrafficPolicy in the Service to either Cluster or Local
-  # externalTrafficPolicy: Cluster
-
-ingress:
-  enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  path: /
-  hosts:
-    - chart-example.local
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
-
-persistence:
-  config:
-    enabled: true
-    ## calibre-web configuration data Persistent Volume Storage Class
-    ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
-    ##
-    # storageClass: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    accessMode: ReadWriteOnce
-    size: 1Gi
-    ## If subPath is set mount a sub folder of a volume instead of the root of the volume.
-    ## This is especially handy for volume plugins that don't natively support sub mounting (like glusterfs).
-    ##
-    subPath: ""
-    ## Do not delete the pvc upon helm uninstall
-    skipuninstall: false
-  books:
-    enabled: true
-    ## Directory where movies are persisted
-    ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
-    ##
-    # storageClass: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    # subPath: some-subpath
-    accessMode: ReadWriteOnce
-    size: 10Gi
-    ## Do not delete the pvc upon helm uninstall
-    skipuninstall: false
-  extraExistingClaimMounts: []
-    # - name: external-mount
-    #   mountPath: /srv/external-mount
-    ## A manually managed Persistent Volume and Claim
-    ## If defined, PVC must be created manually before volume will be bound
-    #   existingClaim:
-    #   readOnly: true
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-podAnnotations: {}
-
-deploymentAnnotations: {}