diff --git a/forgejo/docker-compose.yml b/forgejo/docker-compose.yml
index 394aa8f..07db6e6 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:
-      - /mnt/data/@git/git:/data
+      - /srv/@git/git:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
@@ -55,7 +55,6 @@ services:
       - forgejo
 
   db:
-    container_name: db
     image: postgres:13
     restart: always
     environment:
@@ -63,6 +62,6 @@ services:
       - POSTGRES_PASSWORD=${FORGEJO_DB_PASS}
       - POSTGRES_DB=${FORGEJO_DB_NAME}
     volumes:
-      - /mnt/data/@git/postgres/data/postgres:/var/lib/postgresql/data
+      - ./data/postgres:/var/lib/postgresql/data
     networks:
       - forgejo
diff --git a/homeassistant/docker-compose.yml b/homeassistant/docker-compose.yml
index 42fbcac..ad922c7 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:
-      - /mnt/data/homeassistant:/config
+      - ./config:/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 cd91e89..1dd5d3a 100644
--- a/media/docker-compose.yml
+++ b/media/docker-compose.yml
@@ -1,11 +1,12 @@
+version: '3.3'
 services:
     transmission-openvpn:
         cap_add:
             - NET_ADMIN
         volumes:
-            - '/mnt/data/@media/transmission/data:/data'
-            - '/mnt/data/@media/transmission/config:/config'
-            - '/mnt/data/@media/transmission/vpn:/etc/openvpn/custom'
+            - '/srv/@media/transmission/data:/data'
+            - '/srv/@media/transmission/config:/config'
+            - '/srv/@media/transmission/vpn:/etc/openvpn/custom'
         environment:
             - OPENVPN_PROVIDER=custom
             - OPENVPN_CONFIG=fr
@@ -21,9 +22,9 @@ services:
             options:
                 max-size: 10m
         sysctls:
-            - net.ipv6.conf.all.disable_ipv6=1
+            - net.ipv6.conf.all.disable_ipv6=0
         ports:
-            - 9091:9091
+            - '9091:9091'
         image: haugene/transmission-openvpn
     sonarr:
       image: lscr.io/linuxserver/sonarr:latest
@@ -33,24 +34,11 @@ services:
         - PGID=1000
         - TZ=Etc/CET
       volumes:
-        - /mnt/data/@media/sonarr/data:/config
-        - /mnt/data/@media:/media
+        - /srv/@media/sonarr/data:/config
+        - /srv/@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
@@ -59,7 +47,7 @@ services:
         - PGID=1000
         - TZ=Etc/CET
       volumes:
-        - /mnt/data/@media/prowlarr/config:/config
+        - /srv/@media/prowlarr/config:/config
       ports:
         - 9696:9696
       restart: unless-stopped
@@ -71,9 +59,8 @@ services:
         - PGID=1000
         - TZ=Etc/UTC
       volumes:
-        - /mnt/data/@media/bazarr/config:/config
-        - /mnt/data/@media/transmission/data/completed:/tv #optional, TODO
-        - /mnt/data/@media:/media
+        - /srv/@media/bazarr/config:/config
+        - /srv/@media/transmission/data/completed:/tv #optional, TODO
       ports:
         - 6767:6767
       restart: unless-stopped
@@ -86,11 +73,11 @@ services:
         - TZ=Etc/CET
         - JELLYFIN_PublishedServerUrl=192.168.0.5 #optional, TODO
       volumes:
-        - /mnt/data/@media/jellyfin/library:/config
-        - /mnt/data/@media/media:/data
+        - /srv/@media/jellyfin/library:/config
+        - /srv/@media/media:/data
       ports:
         - 8096:8096
         - 8920:8920 #optional
-        #- 7359:7359/udp #optional
-        #- 1900:1900/udp #optional
+        - 7359:7359/udp #optional
+        - 1900:1900/udp #optional
       restart: unless-stopped
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index 24b251e..1dbc6b7 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:
-      - /mnt/data/@nextcloud/db:/var/lib/mysql
+      - /srv/@nextcloud/db:/var/lib/mysql
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
@@ -22,7 +22,7 @@ services:
     links:
       - db
     volumes:
-      - /mnt/data/@nextcloud/nextcloud:/var/www/html
+      - /srv/@nextcloud/nextcloud:/var/www/html
     environment:
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
       - MYSQL_DATABASE=nextcloud
diff --git a/setup.sh b/setup.sh
deleted file mode 100755
index ae4babf..0000000
--- a/setup.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-echo "Mounting..."
-mount -a
-
-for dir in */
-do
-    echo "Pull&Restart ${dir}"
-    cd $dir
-    docker compose down
-    docker compose pull
-    docker compose up -d
-    cd ..
-done