diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml
index aa1e901fd6..0f7fa624c3 100644
--- a/playbooks/groups/os-cluster.yml
+++ b/playbooks/groups/os-cluster.yml
@@ -128,19 +128,20 @@
     - {
       role: ansible-ansible-openshift-ansible,
         cluster_inventory_filename: "cluster-inventory",
-        openshift_release: "v3.6",
+        openshift_release: "v3.9",
         openshift_ansible_path: "/root/openshift-ansible",
+        openshift_ansible_pre_playbook: "playbooks/prerequisites.yml",
         openshift_ansible_playbook: "playbooks/byo/config.yml",
-        openshift_ansible_version: "openshift-ansible-3.6.173.0.81-1",
+        openshift_ansible_version: "openshift-ansible-3.9.30-1",
         openshift_ansible_ssh_user: root,
-        openshift_ansible_install_examples: true,
+        openshift_ansible_install_examples: false,
         openshift_ansible_containerized_deploy: false,
         openshift_cluster_masters_group: "os-masters",
         openshift_cluster_nodes_group: "os-nodes",
         openshift_cluster_infra_group: "os-nodes",
         openshift_auth_profile: "fedoraidp",
         openshift_master_ha: true,
-        openshift_debug_level: 2,
+        openshift_debug_level: 1,
         openshift_deployment_type: "openshift-enterprise",
         openshift_cluster_url: "{{ os_url}}",
         openshift_app_subdomain: "{{ os_app_url }}",
diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2
index 5183929930..cc7dcdd32b 100644
--- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2
+++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2
@@ -14,11 +14,10 @@ etcd
 
 # Set variables common for all OSEv3 hosts
 [OSEv3:vars]
-{% if env == "staging" %}
 # Disable the service catalog. We don't use it and it needs persistent storage.
 openshift_enable_service_catalog=false
+# Set this because we have nfs which isn't supported
 openshift_enable_unsupported_configurations=true
-{% endif %}
 # Have upgrader also restart systems in a rolling manner.
 openshift_rolling_restart_mode=system
 # Disable the disk and package version tests
@@ -437,12 +436,12 @@ openshift_hosted_registry_storage_nfs_directory=/
 openshift_hosted_registry_storage_volume_name=openshift-stg-registry
 openshift_hosted_registry_storage_volume_size=10Gi
 {% else %}
-#openshift_hosted_registry_storage_kind=nfs
-#openshift_hosted_registry_storage_access_modes=['ReadWriteMany']
-#openshift_hosted_registry_storage_host=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com
-#openshift_hosted_registry_storage_nfs_directory=/
-#openshift_hosted_registry_storage_volume_name=openshift_stg_01
-#openshift_hosted_registry_storage_volume_size=10Gi
+openshift_hosted_registry_storage_kind=nfs
+openshift_hosted_registry_storage_access_modes=['ReadWriteMany']
+openshift_hosted_registry_storage_host=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com
+openshift_hosted_registry_storage_nfs_directory=/
+openshift_hosted_registry_storage_volume_name=openshift-prod-registry
+openshift_hosted_registry_storage_volume_size=10Gi
 {% endif %}
 #
 # Openstack