diff --git a/.ansible-sign/sha256sum.txt b/.ansible-sign/sha256sum.txt
index 05a621b..563e018 100644
--- a/.ansible-sign/sha256sum.txt
+++ b/.ansible-sign/sha256sum.txt
@@ -14,8 +14,8 @@ ed928348412bad55c327b054105ee7af083a4fc8083e7babf1fb3be937314dbe  Web Verificati
 d77935d759fad5b7d5d494471bd820ffbd510608876b4be19681ac3fc781ca3c  roles/deploy_new_release/tasks/main.yml
 f68298b4059cafeaa2de75321f2e60e019fc27e4c0d13ec4ed8f750186b19754  roles/new_release/tasks/main.yml
 37e5e60578c73d664e2f537a70cd7db53ad4194a9bffed9f9d3b2e570e2b3d12  roles/verification_collection/tasks/main.yml
-fcd48941a0b868689293ef158a41737ba98be30a22fb4e2ad768508867c48867  roles/verification_collection/tasks/rhel_verification.yml
-17ceaf81f39be79897817b7f4fe3ee09c7ce143e8627fc3ffd92c645dec15d54  roles/verification_collection/tasks/windows_verification.yml
+926aadfb77327147dbb372cfb37cfb51b1ac4e1c4e20efad9971ccf13f72b939  roles/verification_collection/tasks/rhel_verification.yml
+b34aab9a539ab32e796362544cc86b83887bcc5db3327a153d0dc1848bf23890  roles/verification_collection/tasks/windows_verification.yml
 8322884d79e1151e312fc788d1f955d35f6d3f1094ee4255a1a83391367c34db  roles/webservers_collection/handlers/main.yml
 d29f80f3931d67efbc6d8ef06f855302b88af79b67060c18b58e279d5139cb65  roles/webservers_collection/tasks/main.yml
 5ce4f983d754c24b51f8764d451d3923c731cecdbbc7aed80c2c240b19c50d31  roles/webservers_collection/tasks/rhel_apache_collections.yml
diff --git a/.ansible-sign/sha256sum.txt.sig b/.ansible-sign/sha256sum.txt.sig
index 1d01ab2..ac82dcc 100644
--- a/.ansible-sign/sha256sum.txt.sig
+++ b/.ansible-sign/sha256sum.txt.sig
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQGzBAABCAAdFiEE/bJvyFHKKJdaZDOLTiIiIXrUDNEFAmYz0GcACgkQTiIiIXrU
-DNG82QwArhc4qptOZGOrHbgqIVZjjwjF0ZtKQXIrDQQ3QcbJrGbKhlld0PfMEXRp
-Da+VKePtRphbrjskdgzUjpc8nan54Es/U5r3tC4PErxqG4VTzhqqkDuNZoINWFLP
-qFirDtG7cxVEgmpugKG8X27PXGXKfUwl4sdS2n0lUnUQUyFrB/cwXjgXZm9rhgGK
-cVUuKiVcw+joxErNu2Xnr5OMFfyKwwF5Xrv2u/SiEJ44MPivtL5bA8QgDi5hQGiY
-e7sNyavM+UYoNAK4RUw/4CJeK2g7U0tdIP9j8kL60KAKF7TskuIptJvmXXI3rx8E
-iSMjZeWn/vVAfKQaXtxNiexcO26QyiksJd2CWoCjwBkWHNZEvV647mZoYLQ5lew0
-3dEnbL5jpUDw8Eb/xHUUbBbNgwabVv1orjRO+ME6lpI3NyQyn45AIOYxz9bQEhgq
-NaECcm6b7ts6MV75a3dVuOYCje6F3M24Ps9jjSUFdo4Dr8UbAU50Ba1jB1aORXLS
-nqfRzDNs
-=ArQw
+iQGzBAABCAAdFiEE/bJvyFHKKJdaZDOLTiIiIXrUDNEFAmaWYr8ACgkQTiIiIXrU
+DNF3vQv/WEE+jNNwgf9IIElzMvefgwzO/iGs0AZx+3DWH9MXWfQdACdxE8/k8vz5
+bh42CYj3me8hN9WIn5YZLd3eRIU6l+eZhApsL7OTUUVARxfaX3Oq0JqHVSGZ6XPn
+Ap/AaqEXwuIoNXJnmB+bacfyc3zdsLaa1wBHHJQJl7sBycRczNNOXhFRpvXy+j0T
+RZ1d+a1obUMS9rMyTZZYYipSBvwQEMxfSbRtcqHNFB0nWj5yFUrJgvpqC5iKcBUg
+TwDKp6F7S7TE97K8uk1a5cF/sz5fh82/PLicBf7asJsC2lJiQ/tqRln/NYRFMNUp
+bNaRQIZLItc0yBXy806WGNtoen7lwRfhiQ+oWK8XvCWtd3g9oz+lIsbXVbHFEM1z
+QC+FCdrNxxkcXx3teM1aIl99EmcB18Rm29/bC7VqmJFdU7QvwfJmuoIcFo7Nx8xc
+g5nj15nB19/4U6hxGqBWf8bA4DlzCO2r3bRX6JJ6dYG1PMs+tAcJe8TZ1UpjL/6l
+MbHNKoxH
+=0oRc
 -----END PGP SIGNATURE-----
diff --git a/roles/verification_collection/tasks/rhel_verification.yml b/roles/verification_collection/tasks/rhel_verification.yml
index bae7043..4cf94c1 100644
--- a/roles/verification_collection/tasks/rhel_verification.yml
+++ b/roles/verification_collection/tasks/rhel_verification.yml
@@ -4,7 +4,6 @@
     name: httpd
     state: started
     enabled: true
-  when: os is match("rhel.*") or os == "Red Hat BYOL Linux"
 
 - name: Check that you can connect to the index page and that the hostname is in the contents
   ansible.builtin.uri:
@@ -13,4 +12,3 @@
     return_content: true
   register: this
   failed_when: inventory_hostname not in this.content
-  when: os is match("rhel.*") or os == "Red Hat BYOL Linux"
diff --git a/roles/verification_collection/tasks/windows_verification.yml b/roles/verification_collection/tasks/windows_verification.yml
index 8d85ece..26fac1d 100644
--- a/roles/verification_collection/tasks/windows_verification.yml
+++ b/roles/verification_collection/tasks/windows_verification.yml
@@ -3,7 +3,6 @@
   ansible.windows.win_service:
     name: W3Svc
     state: started
-  when: os is match("windows.*") or os is match("2016.*") or os == "Windows"
 
 - name: Check that you can connect to the index page and that the hostname is in the contents
   ansible.windows.win_uri:
@@ -11,4 +10,3 @@
     validate_certs: false
     return_content: true
   register: this
-  when: os is match("windows.*") or os is match("2016.*") or os == "Windows"