diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml
index bab55e4652..2b406016a9 100644
--- a/playbooks/groups/os-cluster.yml
+++ b/playbooks/groups/os-cluster.yml
@@ -145,6 +145,7 @@
         openshift_api_port: 443,
         openshift_console_port: 443,
         openshift_shared_infra: true,
+        when: env != 'staging',
         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 c889f3332c..9d42bd6fc2 100644
--- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2
+++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2
@@ -761,11 +761,13 @@ openshift_master_console_port={{openshift_console_port}}
 # each OpenShift service: node, master (api and controllers).
 # API and controllers environment variables are merged in single
 # master environments.
-{% if defined no_http2 and no_http2 %}
+{% if no_http2 is defined %}
+{% if no_http2 %}
 openshift_master_api_env_vars={"ENABLE_HTTP2": "true"}
 openshift_master_controllers_env_vars={"ENABLE_HTTP2": "true"}
 openshift_node_env_vars={"ENABLE_HTTP2": "true"}
 {% endif %}
+{% endif %}
 
 # Enable API service auditing, available as of 3.2
 #openshift_master_audit_config={"enabled": true}