diff --git a/roles/openqa/worker/tasks/main.yml b/roles/openqa/worker/tasks/main.yml
index f78f63b6e7..b4aa6a1f80 100644
--- a/roles/openqa/worker/tasks/main.yml
+++ b/roles/openqa/worker/tasks/main.yml
@@ -179,7 +179,7 @@
   when: openqa_nfs_worker|bool
 
 - include_tasks: tap-setup.yml
-  when: openqa_tap|bool
+  when: openqa_tap
 
 - name: Tell git it's OK for _openqa-worker to run 'git' on the test dir
   copy: src=gitconfig dest=/etc/gitconfig owner=root group=root mode=0644
@@ -197,7 +197,7 @@
     enablerepo: "{{ openqa_repo }}"
   tags:
   - packages
-  when: openqa_tap|bool
+  when: openqa_tap
 
 - name: openQA client config
   template: src=client.conf.j2 dest=/etc/openqa/client.conf owner=_openqa-worker group=root mode=0600
diff --git a/roles/openqa/worker/templates/workers.ini.j2 b/roles/openqa/worker/templates/workers.ini.j2
index 4a9bdeebcd..8ca1a5bab3 100644
--- a/roles/openqa/worker/templates/workers.ini.j2
+++ b/roles/openqa/worker/templates/workers.ini.j2
@@ -2,7 +2,7 @@
 HOST = http://{{ openqa_hostname|default('localhost') }}
 {% if openqa_worker_class is defined %}
 WORKER_CLASS = {{ openqa_worker_class }}
-{% elif openqa_tap|bool %}
+{% elif openqa_tap %}
 {% if ansible_architecture == 'ppc64' or ansible_architecture == 'ppc64le' %}
 WORKER_CLASS = {{ openqa_tap }},tpm,qemu_ppc64le,qemu_ppc64
 {% elif ansible_architecture == 'aarch64' %}