diff --git a/CHANGELOG.md b/CHANGELOG.md
index dacd8ef3..e03b8306 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ The **patch** part changes is incremented if multiple releases happen the same m
 
 ### Added
 
+* evolinux-base: option to bypass raid-related tasks
+
 ### Changed
 
 ### Fixed
diff --git a/evolinux-base/defaults/main.yml b/evolinux-base/defaults/main.yml
index 591bc62b..9debc8ab 100644
--- a/evolinux-base/defaults/main.yml
+++ b/evolinux-base/defaults/main.yml
@@ -78,6 +78,7 @@ evolinux_packages_include: True
 evolinux_packages_system: True
 evolinux_packages_diagnostic: True
 evolinux_packages_hardware: True
+evolinux_packages_hardware_raid: True
 evolinux_packages_common: True
 evolinux_packages_stretch: True
 evolinux_packages_buster: True
diff --git a/evolinux-base/tasks/hardware.yml b/evolinux-base/tasks/hardware.yml
index e072f95c..ab838284 100644
--- a/evolinux-base/tasks/hardware.yml
+++ b/evolinux-base/tasks/hardware.yml
@@ -101,6 +101,7 @@
   when:
     - "'Hewlett-Packard Company Smart Array' in raidmodel.stdout"
     - "'Adaptec Smart Storage PQI' in raidmodel.stdout"
+    - evolinux_packages_hardware_raid | bool
 
 # NOTE: check_hpraid cron use check_hpraid from nagios-nrpe role
 # So, if nagios-nrpe role is not installed it will not work
@@ -149,9 +150,11 @@
       tags:
         - packages
         - config
-  when: "'Hewlett-Packard Company Smart Array' in raidmodel.stdout"
+  when:
+    - "'Hewlett-Packard Company Smart Array' in raidmodel.stdout"
+    - evolinux_packages_hardware_raid | bool
 
-- name: MegaRAID SAS package is present
+- name: MegaCLI SAS package is present
   block:
     - name: HWRaid embedded GPG key is absent
       apt_key:
@@ -206,6 +209,8 @@
       tags:
         - packages
         - config
-  when: "'MegaRAID' in raidmodel.stdout"
+  when:
+    - "'MegaRAID' in raidmodel.stdout"
+    - evolinux_packages_hardware_raid | bool
 
 - meta: flush_handlers