diff --git a/ansible/roles/baremetal/defaults/main.yml b/ansible/roles/baremetal/defaults/main.yml
index 9b76da941d..288bccc0a6 100644
--- a/ansible/roles/baremetal/defaults/main.yml
+++ b/ansible/roles/baremetal/defaults/main.yml
@@ -85,14 +85,14 @@ debian_pkg_install:
  - git
  - "{% if not easy_install_available %}python-pip{% endif %}"
  - python-setuptools
- - ntp
+ - "{% if enable_host_ntp | bool %}ntp{% endif %}"
  - "{% if enable_ceph_nfs|bool %}rpcbind{% endif %}"
 
 redhat_pkg_install:
  - "{{ docker_yum_package }}"
  - git
  - python-setuptools
- - ntp
+ - "{% if enable_host_ntp | bool %}ntp{% endif %}"
  - sudo
 
 ubuntu_pkg_removals:
diff --git a/ansible/roles/baremetal/tasks/install.yml b/ansible/roles/baremetal/tasks/install.yml
index 8e3f8e7e82..1dd2d086a4 100644
--- a/ansible/roles/baremetal/tasks/install.yml
+++ b/ansible/roles/baremetal/tasks/install.yml
@@ -74,7 +74,9 @@
     update_cache: yes
   become: True
   with_items: "{{ redhat_pkg_install }}"
-  when: ansible_os_family == 'RedHat'
+  when:
+    - ansible_os_family == 'RedHat'
+    - item != ""
   register: yum_install_result
 
 # If any packages were updated, and any containers were running, wait for the