diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 933b6dff68..bda1622198 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -88,11 +88,8 @@
   - base
   when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
 
-- debug: msg="{{ansible_nodename}}  {{inventory_hostname}} {{ansible_distribution_major_version|int}}"
-
 - name: make sure hostname is set right on rhel7 hosts
-  command: hostnamectl set-hostname {{ inventory_hostname }}
-  when: ( ansible_nodename != inventory_hostname ) and ansible_distribution_major_version|int == 7
+  hostname: name="{{inventory_hostname}}"
 
 - name: sshd_config
   copy: src={{ item }} dest=/etc/ssh/sshd_config mode=600