diff --git a/roles/common/templates/backup_files.sh b/roles/common/templates/backup_files.sh
index 33bca0b..4a02479 100644
--- a/roles/common/templates/backup_files.sh
+++ b/roles/common/templates/backup_files.sh
@@ -4,12 +4,12 @@ set -euxo pipefail;
 
 # Arguments
 path="$1";
-name="$2";
+target="$2";
 
 # Variables
 dir="$(dirname "$path")";
 base="$(basename "$path")";
-dest={{ backups_files_directory | quote }}"/$name/latest.tar.gpg";
+dest="$target/latest.tar.gpg";
 
 # Execution
 tar --directory="$dir" --create --file=- "$base" |
diff --git a/roles/misc/backup_files/defaults/main.yml b/roles/misc/backup_files/defaults/main.yml
index e3c720b..0ae2796 100644
--- a/roles/misc/backup_files/defaults/main.yml
+++ b/roles/misc/backup_files/defaults/main.yml
@@ -3,6 +3,7 @@
 # domain: backup.example # required if backup_name is not given
 backup_name: "{{ domain }}"
 backup_directory: "{{ global_webservers_directory }}/{{ backup_name }}"
+backup_target: "{{ backups_files_directory }}/{{ domain }}"
 
 backup_script: "{{ backup_files_scripts_directory }}/{{ backup_name }}"
 
diff --git a/roles/misc/backup_files/tasks/main.yml b/roles/misc/backup_files/tasks/main.yml
index cbb4bc4..5f09602 100644
--- a/roles/misc/backup_files/tasks/main.yml
+++ b/roles/misc/backup_files/tasks/main.yml
@@ -3,7 +3,7 @@
 - name: Create directory for backups for files of {{ domain }}
   file:
     state: directory
-    path: "{{ backups_files_directory }}/{{ domain }}"
+    path: "{{ backup_target }}"
     owner: root
     group: root
     mode: "u=rwx,g=rx,o=rx"
diff --git a/roles/misc/backup_files/templates/backup.sh b/roles/misc/backup_files/templates/backup.sh
index 0c8338e..2e6a867 100644
--- a/roles/misc/backup_files/templates/backup.sh
+++ b/roles/misc/backup_files/templates/backup.sh
@@ -4,6 +4,6 @@ set -eux;
 
 {{ before_backup_command }}
 
-{{ global_helper_directory }}/backup_files.sh {{ backup_directory | quote }} {{ domain | quote }}
+{{ global_helper_directory }}/backup_files.sh {{ backup_directory | quote }} {{ backup_target | quote }}
 
 {{ after_backup_command }}