diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index d32afb8b8c..1da919c852 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -127,9 +127,8 @@
   - base
   when: ansible_distribution_major_version|int > 29 and ansible_distribution == 'Fedora' and ansible_cmdline.ostree is not defined
 
-- name: make sure hostname is set right on rhel7 hosts
+- name: make sure hostname is set right on all hosts
   hostname: name="{{inventory_hostname}}"
-  when: ansible_distribution_major_version|int == 7 and ansible_distribution == 'RedHat'
 
 #
 # We set builders root password in the koji_builder role, so do not set those here