diff --git a/ansible/main.yml b/ansible/main.yml
index fe175eb..6ccd2a4 100644
--- a/ansible/main.yml
+++ b/ansible/main.yml
@@ -6,7 +6,8 @@
   roles:
     - pve-docker
     - docker-compose
-    - gluetun
+    - name: gluetun
+      tags: test
     - traefik
     - recyclarr
     - prowlarr
@@ -23,5 +24,4 @@
     - lidarr
     - webtrees
     - slskd
-    - name: barassistant
-      tags: test
+    - barassistant
diff --git a/ansible/roles/barassistant/tasks/main.yml b/ansible/roles/barassistant/tasks/main.yml
index 25dd3a4..05a0b12 100644
--- a/ansible/roles/barassistant/tasks/main.yml
+++ b/ansible/roles/barassistant/tasks/main.yml
@@ -13,6 +13,14 @@
     mode: "{{ docker_compose_directory_mask }}"
   become: true
 
+- name: Create data directory
+  file:
+    path: "{{ data_dir }}/barassistant/barassistant"
+    state: directory
+    owner: 33
+    mode: "{{ docker_compose_directory_mask }}"
+  become: true
+
 - name: Copy docker-compose file to destination
   template:
     src: docker-compose.yml
diff --git a/ansible/roles/barassistant/templates/docker-compose.yml b/ansible/roles/barassistant/templates/docker-compose.yml
index 6515c9d..ffe01db 100644
--- a/ansible/roles/barassistant/templates/docker-compose.yml
+++ b/ansible/roles/barassistant/templates/docker-compose.yml
@@ -6,12 +6,13 @@ networks:
 
 services:
   meilisearch:
-    image: getmeili/meilisearch:v1.0
+    image: getmeili/meilisearch:v1.1
     restart: unless-stopped
     networks:
       - default
     environment:
       MEILI_MASTER_KEY: "{{ meili_master_key }}"
+      MEILI_ENV: production
     volumes:
       - "{{ data_dir }}/barassistant/meilisearch:/meili_data"
 
@@ -39,7 +40,7 @@ services:
       REDIS_HOST: redis
       ALLOW_REGISTRATION: "True"
     volumes:
-      - "{{ data_dir }}/barassistant/barassistant:/var/www/cocktails/storage/bar-assisant"
+      - "{{ data_dir }}/barassistant/barassistant:/var/www/cocktails/storage/bar-assistant"
 
   salt-rim:
     image: barassistant/salt-rim:latest
@@ -51,8 +52,8 @@ services:
     environment:
       API_URL: "{{ base_url }}/bar"
       MEILISEARCH_URL: "{{ base_url }}/search"
-      BAR_NAME: "COCKTAILING"
-      DESCRIPTION: Mike's Drinking Time
+      BAR_NAME: "Cocktails"
+      DESCRIPTION: Why is the rum always gone?
       DEFAULT_LOCALE: "en-US"
 
   webserver:
diff --git a/ansible/roles/barassistant/vars/main.yml b/ansible/roles/barassistant/vars/main.yml
index cf6d928..b7855b5 100644
--- a/ansible/roles/barassistant/vars/main.yml
+++ b/ansible/roles/barassistant/vars/main.yml
@@ -1,14 +1,15 @@
 meili_master_key: !vault |
   $ANSIBLE_VAULT;1.1;AES256
-  66653139646366636164313265353866363563346634333562303133653665336163643830353562
-  3465396463663966613161343533333737316133666333610a326139393538376537373437383233
-  39333664346531643033666130623539666539393163313561616135656331323365636361623063
-  6231313866303462310a363831363561656563646538633637656531306162623836343831623162
-  39383161323239376531663435323332393161653431393836663366623835313764663065383365
-  36363866386636366538393835623563383134383162393866306437623865623338336165363239
-  34306237636231336165376236653135356164653638316465626462366562313535613631633861
-  65643763353836343462336133386631633636626264613664356130306233346263323034646633
-  61303761323165343662383861663234383965303134663664613033653037323432623162363865
-  3362613133326163663764373365353732343030626165616536
+  61306335316339383330323264646132363837376264646235353562666239386463613431366361
+  3333666463623564393061616339393164353465633866320a303530613862386466383161623532
+  61653861653032303232666530623739303231363536316530386566313466333236613331303833
+  3734656334333366650a366261323139363635316264383966626237396338663030393931313532
+  33343737316535336539363135333834333462393330663038376132393661323866656132356566
+  39653732366333306134393965383339336330326566303230613362393366383561303939363937
+  64396230323664393236303939643337393034646637643766323938663961636639326466653332
+  30343132636534613835646163643832373835663030326635323236386361346133633964303137
+  36623631353931343861383232373231613837393936316635393838323466656330653835343932
+  64333432386133313363626630623837643237616132336664303963323062386365623266623333
+  343233663635306361333065313334313361
 
 base_url: "https://cocktails.{{ personal_domain }}"
diff --git a/ansible/roles/gluetun/templates/docker-compose.yml b/ansible/roles/gluetun/templates/docker-compose.yml
index 16b80fb..2c31a88 100644
--- a/ansible/roles/gluetun/templates/docker-compose.yml
+++ b/ansible/roles/gluetun/templates/docker-compose.yml
@@ -19,13 +19,15 @@ services:
       - /dev/net/tun:/dev/net/tun
     environment:
       VPN_TYPE: wireguard
-      VPN_SERVICE_PROVIDER: mullvad
+      VPN_SERVICE_PROVIDER: custom
       WIREGUARD_PRIVATE_KEY: "{{ wireguard_private_key }}"
-      WIREGUARD_ADDRESSES: "10.65.208.63/32"
-      FIREWALL_VPN_INPUT_PORTS: {{ vpn_listen_port }}
-      SERVER_CITIES: "Chicago IL"
+      WIREGUARD_PUBLIC_KEY: "1N3x3+Ojc8jONodU0eBnLth3qcmrdlrNK9tkUnVGHT4="
+      WIREGUARD_ADDRESSES: "10.13.128.85/24"
+      VPN_ENDPOINT_IP: "67.213.221.27"
+      VPN_ENDPOINT_PORT: "1443"
+      FIREWALL_VPN_INPUT_PORTS: "42382"
       DOT: "off"
-      DNS_ADRESS: 10.64.0.1
+      DNS_ADDRESS: "10.8.0.1"
       TZ: "{{ timezone }}"
       HTTPPROXY: "on"
       HTTPPROXY_USER: httpproxy
diff --git a/ansible/roles/gluetun/vars/main.yml b/ansible/roles/gluetun/vars/main.yml
index 76fc10b..c703075 100644
--- a/ansible/roles/gluetun/vars/main.yml
+++ b/ansible/roles/gluetun/vars/main.yml
@@ -1,8 +1,8 @@
 wireguard_private_key: !vault |
   $ANSIBLE_VAULT;1.1;AES256
-  65383135373732636133653063333264383865326430333138616332623265323439626461343334
-  6234313462303563623861386234626237633436306233330a633334366166323166666661623039
-  63323935383961663266393038636333633134643263633939653537663232643137653566343630
-  6664613634356336320a626561313062393862353535653864306233353033613065323963613664
-  66646333313761633230366466663636376566616338663866623463643339356466616166616635
-  3164626266653965343230613764303564653061313262656334
+  30613633303762653461333565623032326463643035353238366166353732383465663330633838
+  6463336665386639326230663838343230613765313963350a306131663930323036313136396565
+  39393264353936633833373861666132373663636561653832393130653233376134376262306166
+  3036653365636661660a313463653933666334383530386461613339373632646166623337333863
+  38393037343135326332343263373933336132633930326532616361333330333835366638333633
+  6239313662373530333662643931663639323863366438613865
diff --git a/ansible/roles/nextcloud/tasks/main.yml b/ansible/roles/nextcloud/tasks/main.yml
index c9a7c67..5c0fdfc 100644
--- a/ansible/roles/nextcloud/tasks/main.yml
+++ b/ansible/roles/nextcloud/tasks/main.yml
@@ -1,7 +1,6 @@
 - name: Create service user
   user:
     name: "{{ role_name }}"
-    append: yes
     system: true
   register: service_user
   become: true
diff --git a/ansible/roles/nextcloud/templates/docker-compose.yml b/ansible/roles/nextcloud/templates/docker-compose.yml
index d7d62f4..d5c51f6 100644
--- a/ansible/roles/nextcloud/templates/docker-compose.yml
+++ b/ansible/roles/nextcloud/templates/docker-compose.yml
@@ -20,7 +20,7 @@ services:
       TZ: "{{ timezone }}"
     volumes:
       - "{{ data_dir }}/{{ role_name }}/config:/config"
-      - "{{ media_storage_mnt }}/nextcloud:/data"
+      - "{{ data_dir }}/{{ role_name }}/data:/data"
     labels:
       traefik.enable: true
       traefik.http.routers.nextcloud.rule: "Host(`{{ role_name }}.{{ personal_domain }}`)"
diff --git a/ansible/roles/qbittorrent/files/qbitmanage/config.yml b/ansible/roles/qbittorrent/files/qbitmanage/config.yml
index d10fab3..48fb67d 100755
--- a/ansible/roles/qbittorrent/files/qbitmanage/config.yml
+++ b/ansible/roles/qbittorrent/files/qbitmanage/config.yml
@@ -23,8 +23,6 @@ cat:
   movies.cross-seed: /data/torrents/movies
   tv: /data/torrents/tv
   tv.cross-seed: /data/torrents/tv
-  music: /data/torrents/music
-  music.cross-seed: /data/torrents/music
 
 tracker:
   digitalcore: