diff --git a/ansible/roles/arr/defaults/main.yml b/ansible/roles/arr/defaults/main.yml
index 6b10413..0169c81 100644
--- a/ansible/roles/arr/defaults/main.yml
+++ b/ansible/roles/arr/defaults/main.yml
@@ -2,8 +2,8 @@
 
 arrstack_env_dir: /opt/arrstack
 
-arrstack_data_dir: /srv
-arrstack_data_dir_create: true
+arrstack_serve_dir: /srv
+arrstack_serve_dir_create: true
 
 arrstack_puid: 1000
 arrstack_pgid: 100
diff --git a/ansible/roles/arr/tasks/main.yml b/ansible/roles/arr/tasks/main.yml
index f2710ef..3cc431f 100644
--- a/ansible/roles/arr/tasks/main.yml
+++ b/ansible/roles/arr/tasks/main.yml
@@ -14,7 +14,7 @@
     owner: "{{ arrstack_puid }}"
     group: "{{ arrstack_pgid }}"
     mode: 0770
-  when: arrstack_data_dir_create
+  when: arrstack_serve_dir_create
   loop:
     - ""
     - files
diff --git a/ansible/roles/arr/templates/docker-compose.yaml.j2 b/ansible/roles/arr/templates/docker-compose.yaml.j2
index 00f0252..b4c91b1 100644
--- a/ansible/roles/arr/templates/docker-compose.yaml.j2
+++ b/ansible/roles/arr/templates/docker-compose.yaml.j2
@@ -11,9 +11,9 @@ services:
       - UMASK_SET={{ arrstack_umask_set }}
     volumes:
       - "{{ arrstack_env_dir }}/config/sonarr:/config"
-      - "{{ arrstack_data_dir }}/media/tv:/data/media/tv"
-      - "{{ arrstack_data_dir }}/files/usenet:/data/usenet"
-      - "{{ arrstack_data_dir }}/files/torrent:/data/torrent"
+      - "{{ arrstack_serve_dir }}/media/tv:/data/media/tv"
+      - "{{ arrstack_serve_dir }}/files/usenet:/data/usenet"
+      - "{{ arrstack_serve_dir }}/files/torrent:/data/torrent"
     restart: unless-stopped
     labels:
       caddy: "http://sonarr.pichi.berlin"
@@ -32,8 +32,8 @@ services:
     volumes:
       - "{{ arrstack_env_dir }}/config/radarr:/config"
       - "/mnt/ext/data/media/movies:/data/media/movies" # FIXME: Find solution
-      - "{{ arrstack_data_dir }}/files/usenet:/data/usenet"
-      - "{{ arrstack_data_dir }}/files/torrent:/data/torrent"
+      - "{{ arrstack_serve_dir }}/files/usenet:/data/usenet"
+      - "{{ arrstack_serve_dir }}/files/torrent:/data/torrent"
     restart: unless-stopped
     labels:
       caddy: "http://radarr.pichi.berlin"
@@ -56,9 +56,9 @@ services:
     volumes:
       - "{{ arrstack_env_dir }}/config/lidarr:/config"
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
-      - "{{ arrstack_data_dir }}/media/music:/data/media/music"
-      - "{{ arrstack_data_dir }}/files/usenet:/data/usenet"
-      - "{{ arrstack_data_dir }}/files/torrent:/data/torrent"
+      - "{{ arrstack_serve_dir }}/media/music:/data/media/music"
+      - "{{ arrstack_serve_dir }}/files/usenet:/data/usenet"
+      - "{{ arrstack_serve_dir }}/files/torrent:/data/torrent"
     restart: unless-stopped
     labels:
       caddy: "http://lidarr.pichi.berlin"
@@ -76,9 +76,9 @@ services:
       - UMASK_SET={{ arrstack_umask_set }}
     volumes:
       - "{{ arrstack_env_dir }}/config/readarr:/config"
-      - "{{ arrstack_data_dir }}/media/audiobooks:/data/media/audiobooks"
-      - "{{ arrstack_data_dir }}/files/usenet:/data/usenet"
-      - "{{ arrstack_data_dir }}/files/torrent:/data/torrent"
+      - "{{ arrstack_serve_dir }}/media/audiobooks:/data/media/audiobooks"
+      - "{{ arrstack_serve_dir }}/files/usenet:/data/usenet"
+      - "{{ arrstack_serve_dir }}/files/torrent:/data/torrent"
     restart: unless-stopped
     labels:
       caddy: "http://readarr.pichi.berlin"
@@ -115,8 +115,8 @@ services:
       - MB_PASS={{ arrstack_mb_pass }}
     volumes:
       - "{{ arrstack_env_dir }}/config/beets:/config"
-      - "{{ arrstack_data_dir }}/media/music:/music"
-      - "{{ arrstack_data_dir }}/files/music-unsorted:/downloads"
+      - "{{ arrstack_serve_dir }}/media/music:/music"
+      - "{{ arrstack_serve_dir }}/files/music-unsorted:/downloads"
     restart: unless-stopped
     labels:
       caddy: "http://prowlarr.pichi.berlin"
@@ -134,7 +134,7 @@ services:
       - UMASK_SET={{ arrstack_umask_set }}
     volumes:
       - "{{ arrstack_env_dir }}/config/sabnzbd:/config"
-      - "{{ arrstack_data_dir }}/files/usenet:/data/usenet:rw"
+      - "{{ arrstack_serve_dir }}/files/usenet:/data/usenet:rw"
     restart: unless-stopped
     labels:
       caddy: "http://usenet.pichi.berlin"
@@ -186,7 +186,7 @@ services:
     volumes:
       - "{{ arrstack_env_dir }}/config/piaqbit:/config"
       - "{{ arrstack_env_dir }}/config/gluetun:/gluetun"
-      - "{{ arrstack_data_dir }}/files/torrent:/downloads"
+      - "{{ arrstack_serve_dir }}/files/torrent:/downloads"
     depends_on:
       - vpn
     network_mode: "service:vpn"
@@ -274,8 +274,8 @@ services:
     volumes:
       - "{{ arrstack_env_dir }}/config/audiobookshelf:/config"
       - "{{ arrstack_env_dir }}/data/audiobookshelf:/metadata"
-      - "{{ arrstack_data_dir }}/media/audiobooks:/audiobooks"
-      # - "{{ arrstack_data_dir }}/media/podcasts:/podcasts" # TODO: If integrating podcasts
+      - "{{ arrstack_serve_dir }}/media/audiobooks:/audiobooks"
+      # - "{{ arrstack_serve_dir }}/media/podcasts:/podcasts" # TODO: If integrating podcasts
     restart: unless-stopped
     labels:
       caddy: "http://books.pichi.berlin"
@@ -299,8 +299,8 @@ services:
       - "{{ arrstack_env_dir }}/config/jellyfin:/config"
       - "{{ arrstack_env_dir }}/data/jellyfin:/config/data"
       - "/mnt/ext/data/media/movies:/media/movies" # FIXME: To be changed?
-      - "{{ arrstack_data_dir }}/media/tv:/media/tv"
-      - "{{ arrstack_data_dir }}/media/music:/media/music"
+      - "{{ arrstack_serve_dir }}/media/tv:/media/tv"
+      - "{{ arrstack_serve_dir }}/media/music:/media/music"
     ports: # FIXME: how to enable discovery behind proxies?
       - 7359:7359/udp #optional - network discovery
       - 1900:1900/udp #optional - dlna discovery