diff --git a/validations/ironic-boot-configuration.yaml b/validations/ironic-boot-configuration.yaml
index 25478bab9..c28614911 100644
--- a/validations/ironic-boot-configuration.yaml
+++ b/validations/ironic-boot-configuration.yaml
@@ -31,9 +31,3 @@
     fail: msg='Node {{ item.uuid }} has an incorrectly configured driver_info/deploy_ramdisk. Expected "{{ deploy_ramdisk_id }}" but got "{{ item.driver_info.deploy_ramdisk }}".'
     failed_when: item.driver_info.deploy_ramdisk != deploy_ramdisk_id
     with_items: "{{ ironic_nodes }}"
-
-  - name: Check capabilities
-    fail: msg='Node {{ item.uuid }} is not configured to use boot_option:local in capabilities. It will not be used for deployment with flavors that require boot_option:local.'
-    failed_when: item.properties.capabilities | default('') | regex_search('boot_option:local') == ''
-    with_items: "{{ ironic_nodes }}"
-    ignore_errors: true
diff --git a/validations/library/check_flavors.py b/validations/library/check_flavors.py
index 0b406adfa..b7664b100 100644
--- a/validations/library/check_flavors.py
+++ b/validations/library/check_flavors.py
@@ -23,8 +23,8 @@ module: check_flavors
 short_description: Check that assigned flavors exist and are configured
 description:
     - Validate that the flavors assigned to roles exist and have the correct
-    settings. Right now, that means that boot_option is set to 'local', or
-    if set to 'netboot', issue a warning.
+    settings. Right now, that means that boot_option is unset or set to 'local'
+    , or if set to 'netboot', issue a warning.
 options:
     roles_info:
         required: true
diff --git a/validations/library/verify_profiles.py b/validations/library/verify_profiles.py
index ef8c5748b..76f9d0e40 100644
--- a/validations/library/verify_profiles.py
+++ b/validations/library/verify_profiles.py
@@ -125,7 +125,7 @@ def verify_profiles(nodes, flavors):
                        '{flavor}).\n'
                        'Recommendation: tag more nodes using openstack '
                        'baremetal node set --property "capabilities='
-                       'profile:{profile},boot_option:local" <NODE ID>')
+                       'profile:{profile}" <NODE ID>')
             errors.append(message.format(total=scale - required_count,
                                          scale=scale,
                                          profile=profile,