diff --git a/tasks/borg_server.yml b/tasks/borg_server.yml
index a86f55e..88853a1 100644
--- a/tasks/borg_server.yml
+++ b/tasks/borg_server.yml
@@ -6,62 +6,62 @@
 
 - name: Add borgbackup group
   group: 
-    name: "{{ borg_group }}" 
+    name: "{{ borg.group }}" 
     state: present
 
 - name: Add borgbackup user 
   user: 
-    name: "{{ borg_user }}" 
+    name: "{{ borg.user }}" 
     shell: /bin/bash 
-    home: "{{ borg_home }}" 
+    home: "{{ borg.home }}" 
     createhome: yes 
-    group: "{{ borg_group }}" 
+    group: "{{ borg.group }}" 
     state: present
 
 - name: Fix permission on borgbackup home
   file: 
-    path: "{{ borg_home }}"
-    owner: "{{ borg_user }}"
-    group: "{{ borg_group }}"
+    path: "{{ borg.home }}"
+    owner: "{{ borg.user }}"
+    group: "{{ borg.group }}"
     mode: 0700
     state: directory
 
 - name: Fix .ssh permision
   file:
-    path: "{{ borg_home }}/.ssh"
-    owner: "{{ borg_user }}"
-    group: "{{ borg_group }}"
+    path: "{{ borg.home }}/.ssh"
+    owner: "{{ borg.user }}"
+    group: "{{ borg.group }}"
     mode: 0700
     state: directory
 
 - name: Fix pool permission
   file:
-    path: "{{ borg_pool }}"
-    owner: "{{ borg_user }}"
-    group: "{{ borg_group }}"
+    path: "{{ borg.pool }}"
+    owner: "{{ borg.user }}"
+    group: "{{ borg.group }}"
     mode: 0700
     state: directory
 
 - name: Add autorized backup user through $HOME/.ssh/authorized_keys 
   authorized_key: 
-    user: "{{ borg_user }}"
+    user: "{{ borg.user }}"
     key: "{{ item.key }}"
-    key_options: 'command="cd {{ borg_pool }}/{{ item.host }};borg serve --restrict-to-path {{ borg_pool }}/{{ item.host }}",restrict'
-  with_items: "{{ borg_auth_users }}"
+    key_options: 'command="cd {{ borg.pool }}/{{ item.host }};borg serve --restrict-to-path {{ borg.pool }}/{{ item.host }}",restrict'
+  with_items: "{{ borg.auth_users }}"
 
 - name: Fix permission on authorized_keys
   file: 
-    path: "{{ borg_home }}/.ssh/authorized_keys"
-    owner: "{{ borg_user }}"
-    group: "{{ borg_group }}"
+    path: "{{ borg.home }}/.ssh/authorized_keys"
+    owner: "{{ borg.user }}"
+    group: "{{ borg.group }}"
     mode: 0600
     state: file
 
 - name: Fix permission on each repo
   file:
-    path: "{{ borg_pool }}/{{ item.host }}"
-    owner: "{{ borg_user }}"
-    group: "{{ borg_group }}"
+    path: "{{ borg.pool }}/{{ item.host }}"
+    owner: "{{ borg.user }}"
+    group: "{{ borg.group }}"
     mode: 0700
     state: directory
-  with_items: "{{ borg_auth_users }}"
+  with_items: "{{ borg.auth_users }}"