diff --git a/tasks/hosts.yml b/tasks/hosts.yml
index f12d60511b..5075cbf29c 100644
--- a/tasks/hosts.yml
+++ b/tasks/hosts.yml
@@ -9,13 +9,10 @@
 # This will move a /etc/hosts in place if it's setup in files for that host/domain
 # Note that if it's not set it will just skip this play and do nothing. 
 #
-- name: setup /etc/hosts for client use
+- name: setup /etc/hosts for some clients
   action: copy src=$item dest=/etc/hosts
   with_first_found:
-  - $files/hosts/${ansible_fqdn}-hosts
-  - $files/hosts/${ansible_hostname}-hosts
-  - $files/hosts/${ansible_domain}-hosts
-# once upstream lets us skip on no match
-#  skip: true
+  - files: $files/hosts/{{ ansible_fqdn }}-hosts $files/hosts/{{ ansible_hostname }}-hosts $files/hosts/{{ ansible_domain }}-hosts
+    skip: true
   tags:
   - config