diff --git a/playbooks/repo-build.yml b/playbooks/repo-build.yml
index 4eda2adabd..afd2acde1e 100644
--- a/playbooks/repo-build.yml
+++ b/playbooks/repo-build.yml
@@ -35,12 +35,11 @@
   tasks:
     - name: Prepare group of master repo servers
       add_host:
-        name: "{{ item }}"
+        name: "{{ groups[item][0] }}"
         groups: repo_masters
       when:
-        - "item in groups['repo_servers_' + ansible_distribution_version + '_' + ansible_architecture][0]"
-      with_inventory_hostnames:
-        - repo_all
+        - "item.find('repo_servers_') != -1"
+      with_items: "{{ groups }}"
   tags:
     - always
     - repo-build