diff --git a/roles/hive/common/templates/metaSchemaTool.sh.j2 b/roles/hive/common/templates/metaSchemaTool.sh.j2
index ccd413fc..7d3e16bd 100644
--- a/roles/hive/common/templates/metaSchemaTool.sh.j2
+++ b/roles/hive/common/templates/metaSchemaTool.sh.j2
@@ -6,12 +6,12 @@ export SERVICE_LIST="${SERVICE_LIST}${THISSERVICE} "
 
 metaSchemaTool() {
   HIVE_OPTS=''
-  CLASS=org.apache.hadoop.hive.metastore.tools.MetastoreSchemaTool
+  CLASS=org.apache.hadoop.hive.metastore.tools.schematool.MetastoreSchemaTool
   execHiveCmd $CLASS "$@"
 }
 
 metaSchemaTool_help () {
   HIVE_OPTS=''
-  CLASS=org.apache.hadoop.hive.metastore.tools.MetastoreSchemaTool
+  CLASS=org.apache.hadoop.hive.metastore.tools.schematool.MetastoreSchemaTool
   execHiveCmd $CLASS "--help"
 }
diff --git a/tdp_vars_defaults/hive/hive.yml b/tdp_vars_defaults/hive/hive.yml
index d91a7eed..c05bc5da 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-2.1-bin
+hive_release: apache-hive-4.0.0-0.0-bin
 hive_dist_file: "{{ hive_release }}.tar.gz"
 
 # Hive users and group