diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67c2b02..fac6e22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# v1.6.0
+
+## Important
+- From Peertube 6.0, [storage directoy for video changes](https://github.com/Chocobozzz/PeerTube/releases/tag/v6.0.0)! This new Chart version includes an init script that move directory from `/data/videos` to `/data/web-videos` before starting peertube (as in k8s, it's very hard to move data in place 😅 ) **but you need** to edit your config file accordingly!
+
+## Features
+- Compatibility with Peertube v6.0.2
+- Use the new production.yaml.new files generated by peertube during upgrade if it exists
+
 # v1.5.1
 
 ## Important
diff --git a/Chart.yaml b/Chart.yaml
index dae856d..abc0232 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "v5.2.1-bullseye"
+appVersion: "v6.0.2-bookworm"
 description: A Helm chart to install peertube in kubernetes
 name: peertube
-version: 1.5.1
+version: 1.6.0
diff --git a/scripts/peertube-init.sh b/scripts/peertube-init.sh
index 61acc61..083e6d5 100644
--- a/scripts/peertube-init.sh
+++ b/scripts/peertube-init.sh
@@ -8,10 +8,19 @@ fi
 # Always copy default and custom env configuration file, in cases new keys were added
 cp /app/config/default.yaml /config
 cp /app/support/docker/production/config/custom-environment-variables.yaml /config
+# From 5.2 peertube upgrade script creates a production.yaml.new containing production.yml config and news mandatory keys, directly usable
+if [ -f "/config/production.yaml.new" ]; then
+    mv /config/production.yaml.new /config/production.yaml
+fi
 # Patch user after the cp
 find /config ! -user peertube -exec chown peertube:peertube {} \;
 
+# Move videos data for Peertube 6.0.0 before starting peertube
+if [ -d "/data/videos" -a ! -d "/data/web-videos" ]; then
+    mv /data/videos /data/web-videos
+fi
+
 # Prepare assets for the Nginx sidecar
 cp -r /app/client/dist/* /assets/
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/values.yaml b/values.yaml
index ded573f..b4a4e6c 100644
--- a/values.yaml
+++ b/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 
 image:
   repository: chocobozzz/peertube
-  tag: v5.2.1-bullseye
+  tag: v6.0.2-bookworm
   pullPolicy: IfNotPresent
 
 service: