diff --git a/contrib/ansible/warden-filer-receiver/defaults/main.yml b/contrib/ansible/warden-filer-receiver/defaults/main.yml
index e2bbd78da80a2ed7985d2f341ba0b91b5b4103db..97c552c9c98d36a69d62aca79425eee8580a877e 100644
--- a/contrib/ansible/warden-filer-receiver/defaults/main.yml
+++ b/contrib/ansible/warden-filer-receiver/defaults/main.yml
@@ -1,6 +1,8 @@
 ---
 server_admin: "{{ root@inventory_hostname }}"
 warden_filer_bin_path: /opt/warden-filer
+warden_filer_lib_path: /var/lib/warden_filer
+warden_filer_run_path: /run/warden_filer
 warden_client_cert_path: /etc/ssl/certs/warden.cert.pem
 warden_client_key_path: /etc/ssl/private/warden.key.pem
 warden_client_id_store: /var/lib/warden_filer/warden_filer.id
diff --git a/contrib/ansible/warden-filer-receiver/tasks/main.yml b/contrib/ansible/warden-filer-receiver/tasks/main.yml
index 727e74d468088ebdec137c3546652ccfd100ac64..2ed9aafaf7c9835a10d8c95be3cd76145734fe4a 100644
--- a/contrib/ansible/warden-filer-receiver/tasks/main.yml
+++ b/contrib/ansible/warden-filer-receiver/tasks/main.yml
@@ -1,14 +1,35 @@
 ---
 - name: Checkout Warden repository
   git:
-    repo: https://homeproj.cesnet.cz/git/warden.git/
+    repo: https://gitlab.cesnet.cz/713/warden/warden.git
     version: warden-client-3.0-beta3
     dest: /tmp/warden_client_repository
 
+- name: Create bin dir for warden_filer
+  file:
+    path: "{{ warden_filer_bin_path }}"
+    state: directory
+    owner: root
+    group: root
+    mode: "755"
+
+- name: Create lib and run dir for warden_filer
+  file:
+    path: "{{ item }}"
+    state: directory
+    owner: "{{ warden_filer_uid }}"
+    group: "{{ warden_filer_gid }}"
+    mode: "755"
+  with_items: 
+    - "{{ warden_filer_lib_path }}"
+    - "{{ warden_filer_run_path }}"
+
 - name: Install Filer binaries
   copy:
-    src: "/tmp/warden_client_repository/{{ src }}"
-    dest: "{{ warden_filer_bin_path }}/{{ dest }}"
+    remote_src: true
+    src: "/tmp/warden_client_repository/{{ item.src }}"
+    dest: "{{ warden_filer_bin_path }}/{{ item.dest }}"
+    mode: "755"
   with_items:
     - src: warden_client/warden_client.py
       dest: warden_client.py
@@ -17,15 +38,26 @@
     - src: warden_filer/check_file_count
       dest: check_file_count
 
+- name: Link Filer binary to /usr/local/bin
+  file:
+    src: "{{ warden_filer_bin_path }}/warden_filer.py"
+    dest: "/usr/local/bin/warden_filer.py"
+    state: link
+    owner: root
+    group: root
+    mode: "755"
+
 - name: Install Warden Filer config
   template:
     src: "{{ item }}"
     dest: "/{{ item }}"
   with_items:
     - etc/warden_filer.cfg
-    - etc/defaults/warden_filer_receiver
+    - etc/default/warden_filer_receiver
 
 - name: Install Warden Filer init script
   copy:
+    remote_src: true
     src: /tmp/warden_client_repository/warden_filer/warden_filer_receiver
     dest: /etc/init.d/warden_filer_receiver
+    mode: "755"
diff --git a/contrib/ansible/warden-filer-receiver/templates/etc/defaults/warden_filer_receiver b/contrib/ansible/warden-filer-receiver/templates/etc/default/warden_filer_receiver
similarity index 100%
rename from contrib/ansible/warden-filer-receiver/templates/etc/defaults/warden_filer_receiver
rename to contrib/ansible/warden-filer-receiver/templates/etc/default/warden_filer_receiver
diff --git a/contrib/ansible/warden-server/tasks/main.yml b/contrib/ansible/warden-server/tasks/main.yml
index bf6b3eed3981baa943985f112d861ac880b124e8..8c13dc3eae12d2a42073f6937d66066c2137ef73 100644
--- a/contrib/ansible/warden-server/tasks/main.yml
+++ b/contrib/ansible/warden-server/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Checkout Warden repository
   git:
-    repo: https://homeproj.cesnet.cz/git/warden.git/
+    repo: https://gitlab.cesnet.cz/713/warden/warden.git
     version: warden-server-3.0-beta3
     dest: /tmp/warden_server_repository