diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml
index e8c97ec4ed..42f975cabf 100644
--- a/playbooks/groups/osbs-cluster.yml
+++ b/playbooks/groups/osbs-cluster.yml
@@ -251,6 +251,8 @@
         openshift_shared_infra: true,
         openshift_deployment_type: "origin",
         openshift_ansible_python_interpreter: "/usr/bin/python3",
+        openshift_ansible_use_crio: false,
+        openshift_ansible_crio_only: false,
       when: env == 'production',
       tags: ['openshift-cluster','ansible-ansible-openshift-ansible']
     }
diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2
index 530b05f561..78036735d0 100644
--- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2
+++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2
@@ -106,8 +106,12 @@ openshift_install_examples={{openshift_ansible_install_examples}}
 # Disable pushing to dockerhub
 #openshift_docker_disable_push_dockerhub=True
 # Install and run cri-o.
+{% if openshift_ansible_use_crio is defined %}
 openshift_use_crio={{ openshift_ansible_use_crio }}
+{% endif %}
+{% if openshift_ansible_use_crio_only is defined %}
 openshift_use_crio_only={{ openshift_ansible_crio_only }}
+{% endif %}
 # The following two variables are used when openshift_use_crio is True
 # and cleans up after builds that pass through docker. When openshift_use_crio is True
 # these variables are set to the defaults shown. You may override them here.