diff --git a/charts/calibre-server/Chart.yaml b/charts/calibre-server/Chart.yaml
index 2dcde5b..17d4142 100644
--- a/charts/calibre-server/Chart.yaml
+++ b/charts/calibre-server/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: calibre-server
-version: 0.0.4
+version: 0.0.5
 description: Chart for Calibre content database
 keywords:
   - media
diff --git a/charts/calibre-server/README.md b/charts/calibre-server/README.md
index a69cf68..e67fc63 100644
--- a/charts/calibre-server/README.md
+++ b/charts/calibre-server/README.md
@@ -11,6 +11,7 @@ This chart bootstraps a [Calibre](https://github.com/home-assistant) deployment
 - Kubernetes
 - Helm
 - Traefik v2 / IngressRoute
+- Authentik / Auth
 
 ## Parameters
 
diff --git a/charts/calibre-server/templates/deployment.yaml b/charts/calibre-server/templates/deployment.yaml
index d0334b6..74237f9 100644
--- a/charts/calibre-server/templates/deployment.yaml
+++ b/charts/calibre-server/templates/deployment.yaml
@@ -9,7 +9,6 @@ metadata:
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
     app.kubernetes.io/part-of: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: helm
 spec:
   revisionHistoryLimit: 3
   replicas: {{ .Values.deployment.replicas }}
@@ -28,7 +27,7 @@ spec:
       serviceAccountName: calibre-server
       automountServiceAccountToken: true
       containers:
-        - name: {{ .Release.Name }}
+        - name: calibre-server
           image: "{{ .Values.deployment.image.repository }}:{{ .Values.deployment.image.tag }}"
           imagePullPolicy: {{ .Values.deployment.image.imagePullPolicy }}
           ports:
diff --git a/charts/calibre-server/templates/ingress-route.yaml b/charts/calibre-server/templates/ingress-route.yaml
index 4f94b6e..8cdfe1d 100644
--- a/charts/calibre-server/templates/ingress-route.yaml
+++ b/charts/calibre-server/templates/ingress-route.yaml
@@ -10,7 +10,6 @@ metadata:
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
     app.kubernetes.io/part-of: calibre-server
-    app.kubernetes.io/managed-by: helm
 spec:
   entryPoints:
     - websecure
@@ -18,7 +17,7 @@ spec:
     - kind: Rule
       match: "Host(`{{ .Values.ingressRoute.http.host }}`)"
       middlewares:
-        - name: authentik
+        - name: "authentik-{{ .Release.Name }}"
           namespace: {{ .Release.Namespace }}
       priority: 10
       services:
diff --git a/charts/calibre-server/templates/middleware.yaml b/charts/calibre-server/templates/middleware.yaml
index a50bc80..813876f 100644
--- a/charts/calibre-server/templates/middleware.yaml
+++ b/charts/calibre-server/templates/middleware.yaml
@@ -2,15 +2,14 @@
 apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: authentik
+  name: "authentik-{{ .Release.Name }}"
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: calibre-server
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: auth
-    app.kubernetes.io/part-of: calibre-server
-    app.kubernetes.io/managed-by: helm
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   forwardAuth:
     address: "http://{{ .Values.ingressRoute.authentik.outpost }}.authentik:{{ .Values.ingressRoute.authentik.port }}/outpost.goauthentik.io/auth/traefik"
diff --git a/charts/calibre-server/templates/persistant-volume-claim.yaml b/charts/calibre-server/templates/persistant-volume-claim.yaml
index 9b9f50a..393397c 100644
--- a/charts/calibre-server/templates/persistant-volume-claim.yaml
+++ b/charts/calibre-server/templates/persistant-volume-claim.yaml
@@ -9,7 +9,6 @@ metadata:
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
     app.kubernetes.io/part-of: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: helm
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/charts/calibre-server/templates/service-account.yaml b/charts/calibre-server/templates/service-account.yaml
index 0d04f13..9aec42e 100644
--- a/charts/calibre-server/templates/service-account.yaml
+++ b/charts/calibre-server/templates/service-account.yaml
@@ -9,4 +9,3 @@ metadata:
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
     app.kubernetes.io/part-of: calibre-server
-    app.kubernetes.io/managed-by: helm
diff --git a/charts/calibre-server/templates/service.yaml b/charts/calibre-server/templates/service.yaml
index 2e0ce7a..fb19c6f 100644
--- a/charts/calibre-server/templates/service.yaml
+++ b/charts/calibre-server/templates/service.yaml
@@ -2,14 +2,13 @@ apiVersion: v1
 kind: Service
 metadata:
   name: calibre-server
-  namespace: {{ .Release.Namespace }}  
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: calibre-server
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
     app.kubernetes.io/part-of: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: helm
 spec:
   type: ClusterIP
   ports:
@@ -26,14 +25,13 @@ apiVersion: v1
 kind: Service
 metadata:
   name: calibre-server-content
-  namespace: {{ .Release.Namespace }}  
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: calibre-server
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
     app.kubernetes.io/part-of: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: helm
 spec:
   type: ClusterIP
   ports:
diff --git a/charts/calibre-server/values.yaml b/charts/calibre-server/values.yaml
index f85311b..1683eba 100644
--- a/charts/calibre-server/values.yaml
+++ b/charts/calibre-server/values.yaml
@@ -29,14 +29,14 @@ service:
 ingressRoute:
   enabled: true
   http:
-    host: server.calibre.alexlebens.net
+    host:
   authentik:
     outpost: authentik-proxy-outpost
     port: 9000
 persistence:
   config:
-    storageClassName: ceph-block
+    storageClassName: default
     storageSize: 5Gi
     volumeMode: Filesystem
   books:
-    claimName: calibre-server-nfs-storage
+    claimName: