diff --git a/roles/openqa/worker/tasks/main.yml b/roles/openqa/worker/tasks/main.yml
index ecfaa06be5..2bbd6b4da7 100644
--- a/roles/openqa/worker/tasks/main.yml
+++ b/roles/openqa/worker/tasks/main.yml
@@ -185,11 +185,6 @@
   - packages
   when: openqa_tap|bool
 
-# teardown swtpm services, since os-autoinst does this for us since
-# 7ae93f9f137b8cf7de22f0494a11ead5b7832e46
-- include_tasks: swtpm-teardown.yml
-  when: "openqa_tap|bool and (deployment_type is defined and deployment_type == 'prod')"
-
 - name: openQA client config
   template: src=client.conf.j2 dest=/etc/openqa/client.conf owner=_openqa-worker group=root mode=0600
   tags:
diff --git a/roles/openqa/worker/tasks/swtpm-teardown.yml b/roles/openqa/worker/tasks/swtpm-teardown.yml
deleted file mode 100644
index 465e097284..0000000000
--- a/roles/openqa/worker/tasks/swtpm-teardown.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- name: Remove openqa-swtpm service file
-  file: path=/etc/systemd/system/openqa-swtpm@.service state=absent
-
-- name: Unload custom SELinux policy
-  command: semodule -r systemd-swtpm
-
-- name: Remove custom SELinux policy file
-  file: path=/usr/local/share/selinux/systemd-swtpm.pp state=absent