diff --git a/charts/tautulli/.helmignore b/charts/tautulli/.helmignore
new file mode 100644
index 00000000..46fd8996
--- /dev/null
+++ b/charts/tautulli/.helmignore
@@ -0,0 +1,23 @@
+# 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/tautulli/Chart.yaml b/charts/tautulli/Chart.yaml
index 96975159..720dcd9f 100644
--- a/charts/tautulli/Chart.yaml
+++ b/charts/tautulli/Chart.yaml
@@ -1,31 +1,20 @@
 apiVersion: v2
-name: tautulli
+appVersion: v2.6.1
 description: A Python based monitoring and tracking tool for Plex Media Server
-type: application
-version: 4.0.2
-appVersion: v2.5.4
+name: tautulli
+version: 5.0.0
 keywords:
   - tautulli
+  - plex
 home: https://github.com/k8s-at-home/charts/tree/master/charts/tautulli
 icon: https://github.com/Tautulli/Tautulli/blob/master/data/interfaces/default/images/logo.png?raw=true
 sources:
   - https://github.com/Tautulli/Tautulli
   - https://hub.docker.com/r/tautulli/tautulli
 maintainers:
-  - name: DirtyCajunRice
-    email: nick@cajun.pro
-    url: https://github.com/dirtycajunrice
+  - name: billimek
+    email: jeff@billimek.com
 dependencies:
-  - name: media-common
+  - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.0
-    alias: tautulli
-annotations:
-  artifacthub.io/links: |
-    - name: App Source
-      url: https://github.com/Tautulli/Tautulli
-    - name: Default Docker Image
-      url: https://hub.docker.com/r/tautulli/tautulli
-  artifacthub.io/maintainers: |
-    - name: Nicholas St. Germain
-      email: nick@cajun.pro
+    version: ^1.0.4
diff --git a/charts/tautulli/OWNERS b/charts/tautulli/OWNERS
index 2eb39f10..b90909f4 100644
--- a/charts/tautulli/OWNERS
+++ b/charts/tautulli/OWNERS
@@ -1,4 +1,4 @@
 approvers:
-- DirtyCajunRice
+- billimek
 reviewers:
-- DirtyCajunRice
+- billimek
diff --git a/charts/tautulli/README.md b/charts/tautulli/README.md
index 72605ec4..67762566 100644
--- a/charts/tautulli/README.md
+++ b/charts/tautulli/README.md
@@ -1,53 +1,52 @@
-# Tautulli | A Python based monitoring and tracking tool for Plex Media Server
-Umbrella chart that
-* Uses [media-common](https://github.com/k8s-at-home/charts/tree/master/charts/media-common) as a base
-* Adds docker image information leveraging the [official image](https://hub.docker.com/r/tautulli/tautulli/)
-* Deploys [Tautulli](https://github.com/Tautulli/Tautulli)
+# Tautulli
 
-## TL;DR
-```console
+This is a helm chart for [Tautulli](https://github.com/Tautulli/Tautulli).
+
+## TL;DR;
+
+```shell
 $ helm repo add k8s-at-home https://k8s-at-home.com/charts/
 $ helm install k8s-at-home/tautulli
 ```
 
 ## Installing the Chart
-To install the chart with the release name `tautulli`:
-```console
-helm install tautulli k8s-at-home/tautulli
-```
 
-## Upgrading
-Chart versions before 4.0.0 did not use media-common. Upgrading will require you to nest your values.yaml file under
-a top-level `tautulli:` key.
+To install the chart with the release name `my-release`:
+
+```console
+helm install --name my-release k8s-at-home/tautulli
+```
 
 ## Uninstalling the Chart
-To uninstall the `tautulli` deployment:
+
+To uninstall/delete the `my-release` deployment:
+
 ```console
-helm uninstall tautulli
+helm delete my-release --purge
 ```
+
 The command removes all the Kubernetes components associated with the chart and deletes the release.
 
 ## Configuration
-Read through the media-common [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/media-common/values.yaml)
+Read through the charts [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/tautulli/values.yaml)
 file. It has several commented out suggested values.
+Additionally you can take a look at the common library [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/common/values.yaml) for more (advanced) configuration options.
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 ```console
 helm install tautulli \
-  --set tautulli.env.TZ="America/New York" \
+  --set env.TZ="America/New York" \
     k8s-at-home/tautulli
 ```
-Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
-For example,
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
+chart. For example,
 ```console
 helm install tautulli k8s-at-home/tautulli --values values.yaml 
 ```
 
-These values will be nested as it is a dependency, for example
 ```yaml
-tautulli:
-  image:
-    tag: ...
+image:
+  tag: ...
 ```
 
 ---
@@ -60,3 +59,18 @@ Error: rendered manifests contain a resource that already exists. Unable to cont
 it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
 
 ---
+
+## Upgrading an existing Release to a new major version
+
+A major chart version change (like 4.0.1 -> 5.0.0) indicates that there is an incompatible breaking change potentially needing manual actions.
+
+### Upgrading from 4.x.x to 5.x.x
+
+Due to migrating to a centralized common library some values in `values.yaml` have changed.
+
+Examples:
+
+* `service.port` has been moved to `service.port.port`.
+* `persistence.type` has been moved to `controllerType`.
+
+Refer to the library values.yaml for more configuration options.
diff --git a/charts/tautulli/ci/ct-values.yaml b/charts/tautulli/ci/ct-values.yaml
new file mode 100644
index 00000000..f6ccc628
--- /dev/null
+++ b/charts/tautulli/ci/ct-values.yaml
@@ -0,0 +1,2 @@
+ingress:
+  enabled: true
diff --git a/charts/tautulli/templates/NOTES.txt b/charts/tautulli/templates/NOTES.txt
new file mode 100644
index 00000000..90f7b653
--- /dev/null
+++ b/charts/tautulli/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "common.notes.defaultNotes" . -}}
diff --git a/charts/tautulli/templates/common.yaml b/charts/tautulli/templates/common.yaml
new file mode 100644
index 00000000..a6613c2c
--- /dev/null
+++ b/charts/tautulli/templates/common.yaml
@@ -0,0 +1 @@
+{{ include "common.all" . }}
diff --git a/charts/tautulli/values.yaml b/charts/tautulli/values.yaml
index 86ebed96..57bb7084 100644
--- a/charts/tautulli/values.yaml
+++ b/charts/tautulli/values.yaml
@@ -1,10 +1,20 @@
-# Default values for tautulli.
+# Default values for Tautulli.
 
-tautulli:
-  image:
-    organization: tautulli
-    repository: tautulli
-    pullPolicy: IfNotPresent
-    tag: v2.5.4
-  service:
+image:
+  repository: tautulli/tautulli
+  pullPolicy: IfNotPresent
+  tag: v2.5.4
+
+service:
+  port:
     port: 8181
+
+env: {}
+  # TZ: UTC
+  # PUID: 1001
+  # PGID: 1001
+
+persistence:
+  config:
+    enabled: true
+    emptyDir: true