diff --git a/webapps/peertube/defaults/main.yml b/webapps/peertube/defaults/main.yml
index a9226169..65ac9d23 100644
--- a/webapps/peertube/defaults/main.yml
+++ b/webapps/peertube/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 # defaults file for vars
 peertube_system_dep: "['curl', 'python3-dev', 'python-is-python3', 'python3-psycopg2','certbot', 'nginx', 'ffmpeg', 'postgresql', 'postgresql-contrib', 'openssl', 'g++', 'make', 'redis-server', 'git', 'unzip', 'acl', 'npm']"
-peertube_version: 'v6.0.1'
+peertube_version: 'v6.1.0'
 peertube_download_url: "https://github.com/Chocobozzz/PeerTube/releases/download/{{ peertube_version }}/peertube-{{ peertube_version }}.zip"
 peertube_domains: ['example.domain.org']
 peertube_certbot_admin_email: 'security@evolix.fr'
diff --git a/webapps/peertube/templates/production.yaml.j2 b/webapps/peertube/templates/production.yaml.j2
index 68deb65a..f20c53b1 100644
--- a/webapps/peertube/templates/production.yaml.j2
+++ b/webapps/peertube/templates/production.yaml.j2
@@ -124,6 +124,7 @@ storage:
   avatars: '/var/www/peertube/storage/avatars/'
   web_videos: '/var/www/peertube/storage/web-videos/'
   streaming_playlists: '/var/www/peertube/storage/streaming-playlists/'
+  original_video_files: '/var/www/peertube/storage/original-video-files/'
   redundancy: '/var/www/peertube/storage/redundancy/'
   logs: '/var/www/peertube/storage/logs/'
   previews: '/var/www/peertube/storage/previews/'
@@ -193,9 +194,25 @@ object_storage:
     # Useful when you want to use a CDN/external proxy
     base_url: '' # Example: 'https://mirror.example.com'
 
-  # Same settings but for webtorrent videos
+    # PeerTube makes many small requests to the object storage provider to upload/delete/update live chunks
+    # which can be a problem depending on your object storage provider
+    # You can also choose to disable this feature to reduce live streams latency
+    # Live stream replays are not affected by this setting, so they are uploaded in object storage as regular VOD videos
+    store_live_streams: true
+
   web_videos:
-    bucket_name: 'videos'
+    bucket_name: 'web-videos'
+    prefix: ''
+    base_url: ''
+
+  user_exports:
+    bucket_name: 'user-exports'
+    prefix: ''
+    base_url: ''
+
+  # Same settings but for original video files
+  original_video_files:
+    bucket_name: 'original-video-files'
     prefix: ''
     base_url: ''
 
@@ -328,7 +345,7 @@ views:
     # PeerTube buffers local video views before updating and federating the video
     local_buffer_update_interval: '30 minutes'
 
-    ip_view_expiration: '1 hour'
+    view_expiration: '1 hour'
 
 # Used to get country location of views of local videos
 geo_ip:
diff --git a/webapps/peertube/templates/vhost.conf.j2 b/webapps/peertube/templates/vhost.conf.j2
index 4b5c99af..e3f2276d 100644
--- a/webapps/peertube/templates/vhost.conf.j2
+++ b/webapps/peertube/templates/vhost.conf.j2
@@ -91,6 +91,13 @@ server {
 
     try_files /dev/null @api;
   }
+ 
+  location ~ ^/api/v1/users/[^/]+/imports/import-resumable$ {
+    client_max_body_size    0;
+    proxy_request_buffering off;
+
+    try_files /dev/null @api;
+  }
 
   location ~ ^/api/v1/videos/(upload|([^/]+/studio/edit))$ {
     limit_except POST HEAD { deny all; }