diff --git a/.env.sample b/.env.sample
index 5eacaad..ebd6581 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,7 +1,7 @@
 # General Traefik (reverse proxy) settings
 TRAEFIK_DOMAIN=mydomain.com
 ACME_MAIL=my-email@my-provider.com
-PILOT_TOKEN=mytraefiktoken # Keep it empty is not needed
+PILOT_TOKEN=mytraefiktoken # Keep it empty if not needed
 
 # General settings
 TZ="Europe/Paris"
@@ -14,7 +14,7 @@ HTTP_PASSWORD='mypassword_encoded' # Keep these simple quotes!
 PGID=1000
 PUID=1000
 
-# Database (for Owncloud)
+# Database (for Nextcloud)
 MYSQL_ROOT_PASSWORD=h4ckMePleAse889912101
 MYSQL_DATABASE=nextcloud
 MYSQL_USER=nextcloud
@@ -25,4 +25,4 @@ NEXTCLOUD_ADMIN_USER=admin
 NEXTCLOUD_ADMIN_PASSWORD=h4ckMePleAse873214668
 
 # Portainer
-PORTAINER_ADMIN_PASSWORD=h4ckMePleAse
\ No newline at end of file
+PORTAINER_ADMIN_PASSWORD=h4ckMePleAse
diff --git a/README.md b/README.md
index 6c9039e..a49a64c 100644
--- a/README.md
+++ b/README.md
@@ -9,10 +9,10 @@ seedbox and personal media server.
 -----------------------|----------------------------|------------------------------------------------------------------------|-------------------------|---------------------|
 | Plex                 | plex.yourdomain.com        | [linuxserver/plex](https://hub.docker.com/r/linuxserver/plex)          | *latest*                | Media Streaming     |
 | Deluge               | deluge.yourdomain.com      | [linuxserver/deluge](https://hub.docker.com/r/linuxserver/deluge)      | *latest*                | Torrents downloader |
-| Sonarr               | sonarr.yourdomain.com      | [linuxserver/sonarr](https://hub.docker.com/r/linuxserver/sonarr)      | *preview*               | TV Shows monitor    |
+| Sonarr               | sonarr.yourdomain.com      | [linuxserver/sonarr](https://hub.docker.com/r/linuxserver/sonarr)      | *develop*               | TV Shows monitor    |
 | Radarr               | radarr.yourdomain.com      | [linuxserver/radarr](https://hub.docker.com/r/linuxserver/radarr)      | *develop*                | Movies monitor      |
 | Bazarr               | bazarr.yourdomain.com      | [linuxserver/bazarr](https://hub.docker.com/r/linuxserver/bazarr)      | *latest*                | Subtitles monitor   |
-| Lidarr               | lidarr.yourdomain.com      | [linuxserver/lidarr](https://hub.docker.com/r/linuxserver/lidarr)      | *preview*               | Music monitor       |
+| Lidarr               | lidarr.yourdomain.com      | [linuxserver/lidarr](https://hub.docker.com/r/linuxserver/lidarr)      | *develop*               | Music monitor       |
 | Jackett              | jackett.yourdomain.com     | [linuxserver/jackett](https://hub.docker.com/r/linuxserver/jackett)    | *latest*                | Tracker indexer     |
 | JDownloader          | jdownloader.yourdomain.com | [jlesage/jdownloader-2](https://hub.docker.com/r/jlesage/jdownloader-2)| *latest*                | Direct downloader   |
 | Tautulli (plexPy)    | tautulli.yourdomain.com    | [linuxserver/tautulli](https://hub.docker.com/r/linuxserver/tautulli)  | *latest*                | Plex stats and admin|
diff --git a/services/lidarr.yaml b/services/lidarr.yaml
index dcd4612..d13b01f 100644
--- a/services/lidarr.yaml
+++ b/services/lidarr.yaml
@@ -1,6 +1,6 @@
 services:
   lidarr:
-    image: ghcr.io/linuxserver/lidarr:preview
+    image: ghcr.io/linuxserver/lidarr:develop
     container_name: lidarr
     restart: always
     volumes:
diff --git a/services/sonarr.yaml b/services/sonarr.yaml
index d29bfbe..6ce4d6f 100644
--- a/services/sonarr.yaml
+++ b/services/sonarr.yaml
@@ -1,6 +1,6 @@
 services:
   sonarr:
-    image: ghcr.io/linuxserver/sonarr:preview
+    image: ghcr.io/linuxserver/sonarr:develop
     container_name: sonarr
     restart: always
     volumes:
diff --git a/services/tdarr.yaml b/services/tdarr.yaml
index 231f21a..d5ddffc 100644
--- a/services/tdarr.yaml
+++ b/services/tdarr.yaml
@@ -1,28 +1,56 @@
 services:
   tdarr:
-    image: haveagitgat/tdarr:1.3003
+    image: haveagitgat/tdarr:latest
     container_name: tdarr
     restart: always
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
       - TZ=${TZ}
+      - serverIP=0.0.0.0
+      - serverPort=8266
+      - webUIPort=8265
     volumes:
-      - torrents:/home/Tdarr/Media
-      - configtdarr:/home/Tdarr/Documents/Tdarr
-      - tdarrdb:/var/lib/mongodb
+      - torrents:/media
+      - transcodes:/temp
+      - configtdarrv2:/app/server
+      - settingstdarrv2:/app/configs
     labels:
       - "traefik.enable=true"
-      - "traefik.http.services.tdarr-seedbox.loadbalancer.server.port=8265"
-      - "traefik.http.routers.tdarr.rule=Host(`tdarr.${TRAEFIK_DOMAIN}`)"
-      - "traefik.http.routers.tdarr.middlewares=common-auth@file"
+      - "traefik.http.services.tdarrv2-seedbox.loadbalancer.server.port=8265"
+      - "traefik.http.routers.tdarrv2.rule=Host(`tdarr.${TRAEFIK_DOMAIN}`)"
+      - "traefik.http.routers.tdarrv2.middlewares=common-auth@file"
+
+  tdarr_node:
+    image: haveagitgat/tdarr_node:latest
+    container_name: tdarr_node
+    restart: always
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+      - nodeID=Node1
+      - nodeIP=tdarr_node
+      - nodePort=8267
+      - serverIP=tdarr
+      - serverPort=8266
+    volumes:
+      - torrents:/media
+      - transcodes:/temp
+      - settingstdarrv2:/app/configs
+    labels:
+      - "traefik.enable=false"
 
 volumes:
-  configtdarr:
+  configtdarrv2:
     driver: local-persist
     driver_opts:
-      mountpoint: /data/config/tdarr
-  tdarrdb:
+      mountpoint: /data/config/tdarrv2/server
+  settingstdarrv2:
     driver: local-persist
     driver_opts:
-      mountpoint: /data/config/tdarr-db
\ No newline at end of file
+      mountpoint: /data/config/tdarrv2/configs
+  transcodes:
+    driver: local-persist
+    driver_opts:
+      mountpoint: /data/config/tdarrv2/transcodes
\ No newline at end of file
diff --git a/tools/init-setup-nextcloud.sh b/tools/init-setup-nextcloud.sh
index 2973cc4..66c4b50 100755
--- a/tools/init-setup-nextcloud.sh
+++ b/tools/init-setup-nextcloud.sh
@@ -8,8 +8,8 @@ docker exec -it -u abc -w /config/www/nextcloud \
   nextcloud bash -c " \
     php occ maintenance:install \
       --database \"mysql\" \
-      --database-host \"${MYSQL_DATABASE}\" \
-      --database-name \"nextcloud-db\" \
+      --database-host  \"nextcloud-db\" \
+      --database-name \"${MYSQL_DATABASE}\" \
       --database-user \"${MYSQL_USER}\" \
       --database-pass \"${MYSQL_PASSWORD}\" \
       --admin-user \"${NEXTCLOUD_ADMIN_USER}\" \