diff --git a/playbooks/groups/retrace.yml b/playbooks/groups/retrace.yml
index 6b5359ceed..ff1275cf3f 100644
--- a/playbooks/groups/retrace.yml
+++ b/playbooks/groups/retrace.yml
@@ -42,21 +42,19 @@
    - "{{ private }}/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
-  roles:
-  - base
-  - hosts
-  - fas_client
-  - rkhunter
-  - nagios_client
-  - sudo
-# - fedmsg/base
-
   pre_tasks:
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   tasks:
-  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - import_tasks: "{{ tasks_path }}/motd.yml"
+    - import_role: name=base
+    - import_role: name=hosts
+    - import_role: name=fas_client
+    - import_role: name=rkhunter
+    - import_role: name=nagios_client
+    - import_role: name=sudo
+
+    - import_tasks: "{{ tasks_path }}/2fa_client.yml"
+    - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"
@@ -70,10 +68,17 @@
    - "{{ private }}/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
-  roles:
-  #- abrt/faf-pre
-  #- { role: abrt/faf, faf_web_on_root: false, faf_admin_mail: msuchy@redhat.com, faf_web_openid_privileged_teams: "provenpackager,proventesters", faf_web_secret_key: "{{fedora_faf_web_secret_key}}", faf_spool_dir: /srv/faf/  }
-  - abrt/faf-post
+  tasks:
+    - import_role: name=abrt/faf-pre
+    - import_role: name=abrt/faf
+      vars:
+        faf_web_on_root: false
+        faf_admin_mail: msuchy@redhat.com
+        faf_web_openid_privileged_teams: "provenpackager,proventesters"
+        faf_web_secret_key: "{{fedora_faf_web_secret_key}}"
+        faf_spool_dir: /srv/faf/
+      tags: never
+    - import_role: name=abrt/faf-post
 
 - name: setup retrace server
   hosts: retrace
@@ -84,7 +89,21 @@
    - "{{ private }}/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
-  roles:
-  - abrt/retrace-pre
-  #- { role: abrt/retrace, rs_require_gpg_check: false, rs_max_parallel_tasks: 12, rs_max_packed_size: 1024, rs_max_unpacked_size: 1280, rs_min_storage_left: 1280, rs_delete_task_after: 8, rs_delete_failed_task_after: 1, rs_repo_dir: /srv/retrace/repos, rs_save_dir: /srv/retrace/tasks, rs_faf_link_dir: /srv/retrace/hardlink-local, hostname: retrace.fedoraproject.org, faf_spool_dir: /srv/faf }
-  - abrt/retrace-post
+  tasks:
+    - import_role: name=abrt/retrace-pre
+    - import_role: name=abrt/retrace
+      vars:
+        rs_require_gpg_check: false
+        rs_max_parallel_tasks: 12
+        rs_max_packed_size: 1024
+        rs_max_unpacked_size: 1280
+        rs_min_storage_left: 1280
+        rs_delete_task_after: 8
+        rs_delete_failed_task_after: 1
+        rs_repo_dir: /srv/retrace/repos
+        rs_save_dir: /srv/retrace/tasks
+        rs_faf_link_dir: /srv/retrace/hardlink-local
+        hostname: retrace.fedoraproject.org
+        faf_spool_dir: /srv/faf
+      tags: never
+    - import_role: name=abrt/retrace-post