diff --git a/images/installer/Dockerfile b/images/installer/Dockerfile
index 31bd960da64..63f91f5162c 100644
--- a/images/installer/Dockerfile
+++ b/images/installer/Dockerfile
@@ -9,11 +9,11 @@ COPY images/installer/origin-extra-root /
 
 # install ansible and deps
 RUN INSTALL_PKGS="ansible-2.9.13 azure-cli-2.0.46 java-1.8.0-openjdk-headless python-lxml python-dns openssl python2-passlib httpd-tools openssh-clients origin-clients iproute patch which" \
- && if [ "$(uname -m)" == "x86_64" ]; then INSTALL_PKGS+=" google-cloud-sdk" ; fi \
  && yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS \
- && EPEL_PKGS=" python2-pip.noarch python2-scandir python2-packaging" \
+ && EPEL_PKGS=" python2-pip.noarch python2-crypto python2-scandir python2-packaging" \
  && yum install -y epel-release \
  && yum install -y --setopt=tsflags=nodocs $EPEL_PKGS \
+ && if [ "$(uname -m)" == "x86_64" ]; then yum install -y https://sdodson.fedorapeople.org/google-cloud-sdk-183.0.0-3.el7.x86_64.rpm ; fi \
  && rpm -V $INSTALL_PKGS $EPEL_PKGS \
  && yum clean all
 
diff --git a/playbooks/common/openshift-cluster/upgrades/init.yml b/playbooks/common/openshift-cluster/upgrades/init.yml
index 8a15102cd10..679a7aaee75 100644
--- a/playbooks/common/openshift-cluster/upgrades/init.yml
+++ b/playbooks/common/openshift-cluster/upgrades/init.yml
@@ -7,6 +7,7 @@
 
 - import_playbook: ../../../init/basic_facts.yml
 - import_playbook: ../../../init/base_packages.yml
+- import_playbook: ../../../init/cluster_facts.yml
 
 - name: Inspect cluster certificates
   hosts: "{{ l_upgrade_cert_check_hosts }}"
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/config.yml b/playbooks/common/openshift-cluster/upgrades/pre/config.yml
index c162dc7b51e..4050751b4ff 100644
--- a/playbooks/common/openshift-cluster/upgrades/pre/config.yml
+++ b/playbooks/common/openshift-cluster/upgrades/pre/config.yml
@@ -33,8 +33,6 @@
     # openshift_protect_installed_version is passed n via upgrade_control_plane.yml
     # l_openshift_version_set_hosts is passed via upgrade_control_plane.yml
 
-- import_playbook: ../../../../init/cluster_facts.yml
-
 - name: OpenShift Health Checks
   hosts: "{{ l_upgrade_health_check_hosts }}"
   any_errors_fatal: true
diff --git a/playbooks/init/basic_facts.yml b/playbooks/init/basic_facts.yml
index ffa0b3e994d..f85f5c87947 100644
--- a/playbooks/init/basic_facts.yml
+++ b/playbooks/init/basic_facts.yml
@@ -16,17 +16,6 @@
     import_role:
       name: openshift_sanitize_inventory
 
-  - name: Initialize openshift.node.sdn_mtu
-    openshift_facts:
-      role: node
-      system_facts: "{{ vars_openshift_facts_system_facts }}"
-      local_facts:
-        sdn_mtu: "{{ openshift_node_sdn_mtu | default(None) }}"
-
-  - name: set_fact l_kubelet_node_name
-    set_fact:
-      l_kubelet_node_name: "{{ openshift_kubelet_name_override | default(openshift.node.nodename) }}"
-
   - name: Detecting Operating System from ostree_booted
     stat:
       path: /run/ostree-booted
diff --git a/playbooks/init/cluster_facts.yml b/playbooks/init/cluster_facts.yml
index 73a3b2f26e3..9416105341e 100644
--- a/playbooks/init/cluster_facts.yml
+++ b/playbooks/init/cluster_facts.yml
@@ -24,7 +24,7 @@
     - "groups.oo_first_master | length > 0"
     - "'openshift_portal_net' in hostvars[groups.oo_first_master.0]"
 
-  - name: Gather Common Cluster facts
+  - name: Gather Cluster facts
     openshift_facts:
       role: common
       system_facts: "{{ vars_openshift_facts_system_facts }}"
@@ -39,11 +39,6 @@
         generate_no_proxy_hosts: "{{ openshift_generate_no_proxy_hosts | default(True) }}"
         cloudprovider: "{{ openshift_cloudprovider_kind | default(None) }}"
 
-  - name: Gather Master facts
-    include_role:
-      name: openshift_master_facts
-    when: inventory_hostname in groups['oo_masters'] | default ([])
-
   - name: Set fact of no_proxy_internal_hostnames
     openshift_facts:
       role: common
@@ -63,6 +58,16 @@
     - openshift_http_proxy is defined or openshift_https_proxy is defined
     - openshift_generate_no_proxy_hosts | default(True) | bool
 
+  - name: Initialize openshift.node.sdn_mtu
+    openshift_facts:
+      role: node
+      system_facts: "{{ vars_openshift_facts_system_facts }}"
+      local_facts:
+        sdn_mtu: "{{ openshift_node_sdn_mtu | default(None) }}"
+  - name: set_fact l_kubelet_node_name
+    set_fact:
+      l_kubelet_node_name: "{{ openshift_kubelet_name_override | default(openshift.node.nodename) }}"
+
 - name: Initialize etcd host variables
   hosts: oo_masters_to_config
   roles:
diff --git a/playbooks/init/main.yml b/playbooks/init/main.yml
index 77bce5059ff..228d76b5d0a 100644
--- a/playbooks/init/main.yml
+++ b/playbooks/init/main.yml
@@ -30,10 +30,10 @@
 - import_playbook: base_packages.yml
   when: l_install_base_packages | default(False) | bool
 
-- import_playbook: version.yml
-
 - import_playbook: cluster_facts.yml
 
+- import_playbook: version.yml
+
 - import_playbook: sanity_checks.yml
   when: not (skip_sanity_checks | default(False))
 
diff --git a/playbooks/openshift-master/private/certificates.yml b/playbooks/openshift-master/private/certificates.yml
index ae1a77a8ad8..a6b6eb4bf0e 100644
--- a/playbooks/openshift-master/private/certificates.yml
+++ b/playbooks/openshift-master/private/certificates.yml
@@ -1,8 +1,12 @@
 ---
+- name: Gather Master Facts
+  hosts: oo_masters
+  roles:
+  - role: openshift_master_facts
+
 - name: Create OpenShift certificates for master hosts
   hosts: oo_masters_to_config
   roles:
-  - role: openshift_master_facts
   - role: openshift_named_certificates
   - role: openshift_ca
   - role: openshift_master_certificates