diff --git a/salt/salt/master.sls b/salt/salt/master.sls
index bfd458dc8..17e818503 100644
--- a/salt/salt/master.sls
+++ b/salt/salt/master.sls
@@ -8,6 +8,9 @@
 
 include:
   - salt.minion
+{%   if salt['pillar.get']('hypervisor:nodes', {} ) %}
+  - salt.cloud
+{% endif %}
 
 hold_salt_master_package:
   module.run:
diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls
index 0d995e96c..9c8e2993b 100644
--- a/salt/salt/minion.sls
+++ b/salt/salt/minion.sls
@@ -37,13 +37,15 @@ install_salt_minion:
 {% endif %}
 
 {% if INSTALLEDSALTVERSION|string == SALTVERSION|string %}
-
+# only hold the package if it is already installed
 hold_salt_packages:
   pkg.held:
     - pkgs:
-{% for package in SALTPACKAGES %}
+{%   for package in SALTPACKAGES %}
+{%     if salt['pkg.version'](package) %}
       - {{ package }}: {{SALTVERSION}}-0.*
-{% endfor %}
+{%     endif %}
+{%   endfor %}
 
 remove_error_log_level_logfile:
   file.line: