diff --git a/playbooks/hosts/artboard.fedorainfracloud.org.yml b/playbooks/hosts/artboard.fedorainfracloud.org.yml
index 7b43076ffd..a162e4f20a 100644
--- a/playbooks/hosts/artboard.fedorainfracloud.org.yml
+++ b/playbooks/hosts/artboard.fedorainfracloud.org.yml
@@ -23,7 +23,7 @@
   pre_tasks:
   - include: "{{ tasks }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
-    shell: "hostname {{inventory_hostname}}"
+    hostname: name="{{inventory_hostname}"
 
   tasks:
 
diff --git a/tasks/cloud_setup_basic.yml b/tasks/cloud_setup_basic.yml
index e560e103b9..881d8d4628 100644
--- a/tasks/cloud_setup_basic.yml
+++ b/tasks/cloud_setup_basic.yml
@@ -75,7 +75,7 @@
 
 # note - kinda should be a handler - but handlers need args
 - name: restorecon
-  command: restorecon -R /root/.ssh
+  file: path=/root/.ssh setype=ssh_home_t recurse=yes
   tags:
   - config
 
diff --git a/tasks/persistent_cloud.yml b/tasks/persistent_cloud.yml
index 44c31c518b..1427dc9186 100644
--- a/tasks/persistent_cloud.yml
+++ b/tasks/persistent_cloud.yml
@@ -4,6 +4,7 @@
   local_action: shell nc -w 5 {{ inventory_hostname }} 22 < /dev/null
   register: host_is_up
   ignore_errors: true
+  changed_when: false
 
 - name: clean out old known_hosts (name based entries)
   local_action: known_hosts path={{item}} host={{inventory_hostname}} state=absent