diff --git a/defaults/main.yml b/defaults/main.yml
index c0575b3..c6a923e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -84,4 +84,11 @@ openmanage__base_packages:
   - 'srvadmin-server-snmp'
   - 'srvadmin-storageservices'
                                                                        # ]]]
+# .. envvar:: openmanage__idrac8_packages [[[
+#
+# List of idrac8 packages to install.
+#
+openmanage__idrac8_packages:
+  - 'srvadmin-idracadm8'
+                                                                       # ]]]
                                                                    # ]]]
diff --git a/tasks/main.yml b/tasks/main.yml
index 89399c5..f901124 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -43,6 +43,8 @@
     install_recommends: '{{ openmanage__install_recommends | bool }}'
   with_flattened:
     - '{{ openmanage__dep_packages | to_nice_json }}'
+  register: pkg_dep_result
+  until: pkg_dep_result is success
   when: (openmanage__deploy_state == "present")
 
  ## Manage base system packages
@@ -53,6 +55,8 @@
     install_recommends: '{{ openmanage__install_recommends | bool }}'
   with_flattened:
     - '{{ openmanage__base_packages | to_nice_json }}'
+  register: pkg_base_result
+  until: pkg_base_result is success
 
 # Executable [[[1
 ## Fix some permissions