diff --git a/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml
index 5b8746f2aa6..28ddc3ded88 100644
--- a/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml
@@ -12,9 +12,6 @@
   roles:
   - openshift_facts
   tasks:
-  - set_fact:
-      repoquery_cmd: "{{ 'dnf repoquery --latest-limit 1 -d 0' if ansible_pkg_mgr == 'dnf' else 'repoquery --plugins' }}"
-
   - fail:
       msg: Cannot upgrade Docker on Atomic operating systems.
     when: openshift_is_atomic | bool
diff --git a/playbooks/init/facts.yml b/playbooks/init/facts.yml
index ac4429b2385..1a5e3b51372 100644
--- a/playbooks/init/facts.yml
+++ b/playbooks/init/facts.yml
@@ -26,26 +26,6 @@
       openshift_is_atomic: "{{ ostree_booted.stat.exists }}"
       openshift_is_containerized: "{{ ostree_booted.stat.exists or (containerized | default(false) | bool) }}"
 
-  # TODO: Should this be moved into health checks??
-  # Seems as though any check that happens with a corresponding fail should move into health_checks
-  - name: Validate python version - ans_dist is fedora and python is v3
-    fail:
-      msg: |
-        openshift-ansible requires Python 3 for {{ ansible_distribution }};
-        For information on enabling Python 3 with Ansible, see https://docs.ansible.com/ansible/python_3_support.html
-    when:
-    - ansible_distribution == 'Fedora'
-    - ansible_python['version']['major'] != 3
-
-  # TODO: Should this be moved into health checks??
-  # Seems as though any check that happens with a corresponding fail should move into health_checks
-  - name: Validate python version - ans_dist not Fedora and python must be v2
-    fail:
-      msg: "openshift-ansible requires Python 2 for {{ ansible_distribution }}"
-    when:
-    - ansible_distribution != 'Fedora'
-    - ansible_python['version']['major'] != 2
-
   # TODO: Should this be moved into health checks??
   # Seems as though any check that happens with a corresponding fail should move into health_checks
   # Fail as early as possible if Atomic and old version of Docker
@@ -136,11 +116,6 @@
       local_facts:
         sdn_mtu: "{{ openshift_node_sdn_mtu | default(None) }}"
 
-  - name: initialize_facts set_fact repoquery command
-    set_fact:
-      repoquery_cmd: "{{ 'dnf repoquery --latest-limit 1 -d 0' if ansible_pkg_mgr == 'dnf' else 'repoquery --plugins' }}"
-      repoquery_installed: "{{ 'dnf repoquery --latest-limit 1 -d 0 --disableexcludes=all --installed' if ansible_pkg_mgr == 'dnf' else 'repoquery --plugins --installed' }}"
-
 - name: Initialize special first-master variables
   hosts: oo_first_master
   roles:
diff --git a/playbooks/init/main.yml b/playbooks/init/main.yml
index 06e8ba50489..20457e508d1 100644
--- a/playbooks/init/main.yml
+++ b/playbooks/init/main.yml
@@ -20,9 +20,6 @@
 - import_playbook: sanity_checks.yml
   when: not (skip_sanity_checks | default(False))
 
-- import_playbook: validate_hostnames.yml
-  when: not (skip_validate_hostnames | default(False))
-
 - import_playbook: version.yml
   when: not (skip_verison | default(False))
 
diff --git a/playbooks/prerequisites.yml b/playbooks/prerequisites.yml
index 68d7f3359d4..113d68e0fee 100644
--- a/playbooks/prerequisites.yml
+++ b/playbooks/prerequisites.yml
@@ -3,6 +3,9 @@
   vars:
     skip_verison: True
 
+- import_playbook: validate_hostnames.yml
+  when: not (skip_validate_hostnames | default(False))
+
 - import_playbook: init/repos.yml
 
 # This is required for container runtime for crio, only needs to run once.
diff --git a/roles/container_runtime/defaults/main.yml b/roles/container_runtime/defaults/main.yml
index 3e4b0c2b85a..f4e249792bb 100644
--- a/roles/container_runtime/defaults/main.yml
+++ b/roles/container_runtime/defaults/main.yml
@@ -2,8 +2,6 @@
 docker_cli_auth_config_path: '/root/.docker'
 openshift_docker_signature_verification: False
 
-repoquery_cmd: "{{ 'dnf repoquery --latest-limit 1 -d 0' if ansible_pkg_mgr == 'dnf' else 'repoquery --plugins' }}"
-
 openshift_docker_alternative_creds: False
 
 # oreg_url is defined by user input.
diff --git a/roles/lib_utils/action_plugins/sanity_checks.py b/roles/lib_utils/action_plugins/sanity_checks.py
index 81ffd6e3ec5..2ddcf77e4c8 100644
--- a/roles/lib_utils/action_plugins/sanity_checks.py
+++ b/roles/lib_utils/action_plugins/sanity_checks.py
@@ -30,6 +30,19 @@ def template_var(self, hostvars, host, varname):
             return None
         return self._templar.template(res)
 
+    def check_python_version(self, hostvars, host, distro):
+        """Ensure python version is 3 for Fedora and python 2 for others"""
+        ansible_python = self.template_var(hostvars, host, 'ansible_python')
+        if distro == "Fedora":
+            if ansible_python['version']['major'] != 3:
+                msg = "openshift-ansible requires Python 3 for {};".format(distro)
+                msg += " For information on enabling Python 3 with Ansible,"
+                msg += " see https://docs.ansible.com/ansible/python_3_support.html"
+                raise errors.AnsibleModuleError(msg)
+        else:
+            if ansible_python['version']['major'] != 2:
+                msg = "openshift-ansible requires Python 2 for {};".format(distro)
+
     def network_plugin_check(self, hostvars, host):
         """Ensure only one type of network plugin is enabled"""
         res = []
@@ -59,7 +72,8 @@ def check_hostname_vars(self, hostvars, host):
 
     def run_checks(self, hostvars, host):
         """Execute the hostvars validations against host"""
-        # msg = hostvars[host]['ansible_default_ipv4']
+        distro = self.template_var(hostvars, host, 'ansible_distribution')
+        self.check_python_version(hostvars, host, distro)
         self.network_plugin_check(hostvars, host)
         self.check_hostname_vars(hostvars, host)
 
diff --git a/roles/openshift_facts/defaults/main.yml b/roles/openshift_facts/defaults/main.yml
index af0a72737e5..a4252afb01e 100644
--- a/roles/openshift_facts/defaults/main.yml
+++ b/roles/openshift_facts/defaults/main.yml
@@ -5,6 +5,9 @@ openshift_cli_image_dict:
   origin: 'openshift/origin'
   openshift-enterprise: 'openshift3/ose'
 
+repoquery_cmd: "{{ ansible_pkg_mgr == 'dnf' | ternary('dnf repoquery --latest-limit 1 -d 0', 'repoquery --plugins') }}"
+repoquery_installed: "{{ ansible_pkg_mgr == 'dnf' | ternary('dnf repoquery --latest-limit 1 -d 0 --disableexcludes=all --installed', 'repoquery --plugins --installed') }}"
+
 openshift_hosted_images_dict:
   origin: 'openshift/origin-${component}:${version}'
   openshift-enterprise: 'openshift3/ose-${component}:${version}'