diff --git a/evolinux-base/tasks/hardware.yml b/evolinux-base/tasks/hardware.yml
index 34ed46b3..127988a9 100644
--- a/evolinux-base/tasks/hardware.yml
+++ b/evolinux-base/tasks/hardware.yml
@@ -29,7 +29,9 @@
 # HP gen <10: Hewlett-Packard Company Smart Array
 # HP gen >=10: Adaptec Smart Storage PQI
 - name: Detect if RAID is installed
-  shell: "set -o pipefail && lspci -q | grep -e 'RAID bus controller' -e 'Serial Attached SCSI controller'"
+  shell: 
+    cmd: "set -o pipefail && lspci -q | grep -e 'RAID bus controller' -e 'Serial Attached SCSI controller'"
+    executable: /bin/bash
   check_mode: no
   register: raidmodel
   changed_when: "'FAILED' in raidmodel.stdout"
@@ -114,9 +116,7 @@
         id: "23B3D3B4"
         keyring: /etc/apt/trusted.gpg
         state: absent
-      when:
-        - trusted_gpg_keyring.stat.present
-        - ansible_distribution_major_version is version('9', '>=')
+      when: _trusted_gpg_keyring.stat.exists
 
     - name: HWRaid GPG key is installed
       copy:
@@ -151,6 +151,6 @@
         name: megaclisas-statusd
         enabled: true
         state: started
-  when: "'MegaRAID SAS' in raidmodel.stdout"
+  when: "'MegaRAID' in raidmodel.stdout"
 
 - meta: flush_handlers