diff --git a/roles/hive/ranger/tasks/init.yml b/roles/hive/ranger/tasks/init.yml
index 00d8aebb..5d604a7f 100644
--- a/roles/hive/ranger/tasks/init.yml
+++ b/roles/hive/ranger/tasks/init.yml
@@ -14,7 +14,7 @@
         username: hive
         password: hive
         jdbc.driverClassName: "org.apache.hive.jdbc.HiveDriver"
-        jdbc.url: jdbc:hive2://{{ ranger_hive_install_properties.zookeeper_quorum }}/;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2;sslTrustStore={{ hive_truststore_location }};trustStorePassword={{ hive_truststore_password }} # yamllint disable-line rule:line-length
+        jdbc.url: jdbc:hive2://{{ ranger_hive_install_properties.zookeeper_quorum }}/;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace={{ hiveserver2_site["hive.server2.zookeeper.namespace"] }};sslTrustStore={{ hive_truststore_location }};trustStorePassword={{ hive_truststore_password }} # yamllint disable-line rule:line-length
         policy.download.auth.users: hive
       type: hive
     body_format: json
diff --git a/tdp_vars_defaults/hive/hive.yml b/tdp_vars_defaults/hive/hive.yml
index 42013799..279d6635 100644
--- a/tdp_vars_defaults/hive/hive.yml
+++ b/tdp_vars_defaults/hive/hive.yml
@@ -3,7 +3,7 @@
 
 ---
 # Hive version
-hive_release: apache-hive-3.1.3-1.0-bin
+hive_release: apache-hive-3.1.3-2.0-bin
 hive_dist_file: "{{ hive_release }}.tar.gz"
 
 # Hive users and group
@@ -133,9 +133,10 @@ hiveserver2_site:
   hive.server2.webui.keystore.password: "{{ hive_keystore_password }}"
   hive.server2.metrics.enabled: "true"
   hive.server2.thrift.http.cookie.auth.enabled: "true"
+  hive.server2.zookeeper.namespace: "{{ hive_s2_zookeeper_namespace }}"
 
 beeline_site:
-  beeline.hs2.jdbc.url.zk_cluster: jdbc:hive2://{{ hive_site["hive.zookeeper.quorum"] }}/;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2;principal={{ hiveserver2_site["hive.server2.authentication.kerberos.principal"] }};sslTrustStore={{ hive_truststore_location }};trustStorePassword={{ hive_truststore_password }}
+  beeline.hs2.jdbc.url.zk_cluster: jdbc:hive2://{{ hive_site["hive.zookeeper.quorum"] }}/;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace={{ hiveserver2_site["hive.server2.zookeeper.namespace"] }};principal={{ hiveserver2_site["hive.server2.authentication.kerberos.principal"] }};sslTrustStore={{ hive_truststore_location }};trustStorePassword={{ hive_truststore_password }}
   beeline.hs2.jdbc.url.default: zk_cluster
 
 # Ranger Hive properties
diff --git a/tdp_vars_defaults/knox/knox.yml b/tdp_vars_defaults/knox/knox.yml
index 1d2d2c9b..71f21573 100644
--- a/tdp_vars_defaults/knox/knox.yml
+++ b/tdp_vars_defaults/knox/knox.yml
@@ -128,7 +128,7 @@ tdpldap_identity:
 tdpldap_ha:
   name: HaProvider
   parameters:
-    HIVE: "{{ topology_common_ha_configuration }};zookeeperEnsemble={{ zookeeper_quorum | trim }};zookeeperNamespace=hiveserver2"
+    HIVE: "{{ topology_common_ha_configuration }};zookeeperEnsemble={{ zookeeper_quorum | trim }};zookeeperNamespace={{ hive_s2_zookeeper_namespace }}"
     RESOURCEMANAGER: "{{ topology_common_ha_configuration }}"
     WEBHBASE: "{{ topology_common_ha_configuration }}"
     WEBHDFS: "{{ topology_common_ha_configuration }}"
diff --git a/tdp_vars_defaults/tdp-cluster/tdp-cluster.yml b/tdp_vars_defaults/tdp-cluster/tdp-cluster.yml
index 8aaf4c7d..4af130ff 100644
--- a/tdp_vars_defaults/tdp-cluster/tdp-cluster.yml
+++ b/tdp_vars_defaults/tdp-cluster/tdp-cluster.yml
@@ -204,6 +204,7 @@ hive_log_dir: /var/log/hive
 hive_s2_log_file: "hive-hiveserver2_{{ ansible_fqdn }}.log"
 hive_ms_log_file: "hive-metastore_{{ ansible_fqdn }}.log"
 hive_ranger_audit_file: "hive-rangeraudit_{{ ansible_fqdn }}.log"
+hive_s2_zookeeper_namespace: "hiveserver2"
 
 knox_log_dir: /var/log/knox
 knox_gateway_log_file: "knox-gateway_{{ ansible_fqdn }}.log"