diff --git a/roles/openqa/dispatcher/vars/main.yml b/roles/openqa/dispatcher/defaults/main.yml
similarity index 100%
rename from roles/openqa/dispatcher/vars/main.yml
rename to roles/openqa/dispatcher/defaults/main.yml
diff --git a/roles/openqa/worker/vars/main.yml b/roles/openqa/worker/defaults/main.yml
similarity index 100%
rename from roles/openqa/worker/vars/main.yml
rename to roles/openqa/worker/defaults/main.yml
diff --git a/roles/openqa/worker/tasks/main.yml b/roles/openqa/worker/tasks/main.yml
index 94c49f31a6..70c4c70ed9 100644
--- a/roles/openqa/worker/tasks/main.yml
+++ b/roles/openqa/worker/tasks/main.yml
@@ -30,9 +30,6 @@
 - include: nfs-client.yml
   when: openqa_hostname is defined and openqa_hostname != "localhost"
 
-- name: Debug openqa_hostname var
-  debug: var=openqa_hostname
-
 - name: openQA client config
   template: src=client.conf.j2 dest=/etc/openqa/client.conf owner=_openqa-worker group=root mode=0600
   tags: