diff --git a/forgejo/docker-compose.yml b/forgejo/docker-compose.yml
index 07db6e6..bee0023 100644
--- a/forgejo/docker-compose.yml
+++ b/forgejo/docker-compose.yml
@@ -45,7 +45,7 @@ services:
       - FORGEJO__database__PASSWD=${FORGEJO_DB_PASS}
     restart: always
     volumes:
-      - /srv/@git/git:/data
+      - /mnt/data/@git/git:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
@@ -62,6 +62,6 @@ services:
       - POSTGRES_PASSWORD=${FORGEJO_DB_PASS}
       - POSTGRES_DB=${FORGEJO_DB_NAME}
     volumes:
-      - ./data/postgres:/var/lib/postgresql/data
+      - /mnt/data/@git/postgres/data/postgres:/var/lib/postgresql/data
     networks:
       - forgejo
diff --git a/homeassistant/docker-compose.yml b/homeassistant/docker-compose.yml
index ad922c7..42fbcac 100644
--- a/homeassistant/docker-compose.yml
+++ b/homeassistant/docker-compose.yml
@@ -3,7 +3,7 @@ services:
     container_name: homeassistant
     image: "ghcr.io/home-assistant/home-assistant:stable"
     volumes:
-      - ./config:/config
+      - /mnt/data/homeassistant:/config
       - /etc/localtime:/etc/localtime:ro
       - /run/dbus:/run/dbus:ro
     restart: unless-stopped
diff --git a/media/docker-compose.yml b/media/docker-compose.yml
index 1dd5d3a..64fc2e2 100644
--- a/media/docker-compose.yml
+++ b/media/docker-compose.yml
@@ -4,9 +4,9 @@ services:
         cap_add:
             - NET_ADMIN
         volumes:
-            - '/srv/@media/transmission/data:/data'
-            - '/srv/@media/transmission/config:/config'
-            - '/srv/@media/transmission/vpn:/etc/openvpn/custom'
+            - '/mnt/data/@media/transmission/data:/data'
+            - '/mnt/data/@media/transmission/config:/config'
+            - '/mnt/data/@media/transmission/vpn:/etc/openvpn/custom'
         environment:
             - OPENVPN_PROVIDER=custom
             - OPENVPN_CONFIG=fr
@@ -34,11 +34,24 @@ services:
         - PGID=1000
         - TZ=Etc/CET
       volumes:
-        - /srv/@media/sonarr/data:/config
-        - /srv/@media:/media
+        - /mnt/data/@media/sonarr/data:/config
+        - /mnt/data/@media:/media
       ports:
         - 8989:8989
       restart: unless-stopped
+    radarr:
+      image: lscr.io/linuxserver/radarr:latest
+      container_name: radarr
+      environment:
+        - PUID=1000
+        - PGID=1000
+        - TZ=Etc/CET
+      volumes:
+        - /mnt/data/@media/radarr/data:/config
+        - /mnt/data/@media:/media
+      ports:
+        - 7878:7878
+      restart: unless-stopped
     prowlarr:
       image: lscr.io/linuxserver/prowlarr:latest
       container_name: prowlarr
@@ -47,7 +60,7 @@ services:
         - PGID=1000
         - TZ=Etc/CET
       volumes:
-        - /srv/@media/prowlarr/config:/config
+        - /mnt/data/@media/prowlarr/config:/config
       ports:
         - 9696:9696
       restart: unless-stopped
@@ -59,8 +72,8 @@ services:
         - PGID=1000
         - TZ=Etc/UTC
       volumes:
-        - /srv/@media/bazarr/config:/config
-        - /srv/@media/transmission/data/completed:/tv #optional, TODO
+        - /mnt/data/@media/bazarr/config:/config
+        - /mnt/data/@media/transmission/data/completed:/tv #optional, TODO
       ports:
         - 6767:6767
       restart: unless-stopped
@@ -73,8 +86,8 @@ services:
         - TZ=Etc/CET
         - JELLYFIN_PublishedServerUrl=192.168.0.5 #optional, TODO
       volumes:
-        - /srv/@media/jellyfin/library:/config
-        - /srv/@media/media:/data
+        - /mnt/data/@media/jellyfin/library:/config
+        - /mnt/data/@media/media:/data
       ports:
         - 8096:8096
         - 8920:8920 #optional
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index 1dbc6b7..24b251e 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     restart: always
     command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
     volumes:
-      - /srv/@nextcloud/db:/var/lib/mysql
+      - /mnt/data/@nextcloud/db:/var/lib/mysql
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
@@ -22,7 +22,7 @@ services:
     links:
       - db
     volumes:
-      - /srv/@nextcloud/nextcloud:/var/www/html
+      - /mnt/data/@nextcloud/nextcloud:/var/www/html
     environment:
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
       - MYSQL_DATABASE=nextcloud