diff --git a/ansible/inventory/host_vars/nas-1.renner.uno/vars.yml b/ansible/inventory/host_vars/nas-1.renner.uno/vars.yml
index 9335e94b..d7a2975f 100644
--- a/ansible/inventory/host_vars/nas-1.renner.uno/vars.yml
+++ b/ansible/inventory/host_vars/nas-1.renner.uno/vars.yml
@@ -8,6 +8,8 @@ pbs_backup_paths:
   - /volume1/Media
   - /volume1/Music
   - /volume1/video
+  - /volume2/Backup
+  - /volume1/Movies
 
   # Add more paths as needed:
   # - /volume1/photos
diff --git a/ansible/roles/pbs-client/defaults/main.yml b/ansible/roles/pbs-client/defaults/main.yml
index b1bb6f72..c711c03e 100644
--- a/ansible/roles/pbs-client/defaults/main.yml
+++ b/ansible/roles/pbs-client/defaults/main.yml
@@ -3,7 +3,7 @@
 pbs_client_version: "latest"
 pbs_client_data_dir: "/opt/pbs-client"
 
-# PBS Server connection
+# PBS Server connection (override in host_vars)
 pbs_server_host: "pbs.obg.renner.uno"
 pbs_server_port: 8007
 pbs_datastore: "backups"
diff --git a/ansible/roles/pbs-client/templates/docker-compose.yml.j2 b/ansible/roles/pbs-client/templates/docker-compose.yml.j2
index 6f184011..2a2f57a0 100644
--- a/ansible/roles/pbs-client/templates/docker-compose.yml.j2
+++ b/ansible/roles/pbs-client/templates/docker-compose.yml.j2
@@ -5,19 +5,25 @@ services:
     restart: unless-stopped
     hostname: {{ pbs_backup_id }}
     environment:
-      - PBS_REPOSITORY={{ pbs_username }}@{{ pbs_server_host }}:{{ pbs_server_port }}:{{ pbs_datastore }}
+      - PBS_ENDPOINT={{ pbs_server_host }}:{{ pbs_server_port }}
+      - PBS_DATASTORE={{ pbs_datastore }}
+      - PBS_API_KEY_NAME={{ pbs_username }}
+      - PBS_API_KEY_SECRET={{ pbs_password }}
       - PBS_PASSWORD={{ pbs_password }}
-      - BACKUP_ID={{ pbs_backup_id }}
+      - PBS_ENCRYPTION_PASSWORD={{ pbs_encryption_password | default(pbs_password) }}
+      - PBS_REPOSITORY={{ pbs_username }}@{{ pbs_server_host }}:{{ pbs_server_port }}:{{ pbs_datastore }}
+      - PBS_BACKUP_ID={{ pbs_backup_id }}
       - CRON_SCHEDULE={{ pbs_backup_schedule }}
+      - PBS_BACKUP_CMD_APPEND_EXTRA_OPTS=--crypt-mode=none
       - PRUNE_KEEP_LAST={{ pbs_keep_last | default(3) }}
       - PRUNE_KEEP_DAILY={{ pbs_keep_daily | default(7) }}
       - PRUNE_KEEP_WEEKLY={{ pbs_keep_weekly | default(4) }}
       - PRUNE_KEEP_MONTHLY={{ pbs_keep_monthly | default(6) }}
-      - RUN_BACKUP_ON_START=false
+      - CRON_BACKUP_ONLY=1
     volumes:
       - {{ pbs_client_data_dir }}/state:/root/.config/proxmox-backup
 {% for path in pbs_backup_paths %}
-      - "{{ path }}:/backups/{{ path | basename }}:ro"
+      - "{{ path }}:/backups/{{ path | basename | replace(' ', '_') }}:ro"
 {% endfor %}
     tmpfs:
       - /tmp