diff --git a/sahara/plugins/hdp/versions/version_1_3_2/resources/default-cluster.template b/sahara/plugins/hdp/versions/version_1_3_2/resources/default-cluster.template
index db811f13..200728eb 100644
--- a/sahara/plugins/hdp/versions/version_1_3_2/resources/default-cluster.template
+++ b/sahara/plugins/hdp/versions/version_1_3_2/resources/default-cluster.template
@@ -279,7 +279,7 @@
     {
       "name" : "global",
       "properties" : [
-        { "name" : "java64_home", "value" : "/opt/jdk1.6.0_31" },
+        { "name" : "java64_home", "value" : "/usr/lib/jvm/java-openjdk" },
         { "name" : "dfs_name_dir", "value" : "/mnt/hadoop/hdfs/namenode" },
         { "name" : "fs_checkpoint_dir", "value" : "/hadoop/hdfs/namesecondary" },
         { "name" : "dfs_data_dir", "value" : "/hadoop/hdfs/data" },
diff --git a/sahara/plugins/hdp/versions/version_2_0_6/resources/default-cluster.template b/sahara/plugins/hdp/versions/version_2_0_6/resources/default-cluster.template
index 7f912173..3914a48c 100644
--- a/sahara/plugins/hdp/versions/version_2_0_6/resources/default-cluster.template
+++ b/sahara/plugins/hdp/versions/version_2_0_6/resources/default-cluster.template
@@ -318,7 +318,7 @@
       "properties" : [
           {
             "name" : "java64_home",
-            "value" : "/opt/jdk1.6.0_31" },
+            "value" : "/usr/lib/jvm/java-openjdk" },
           {
             "name": "security_enabled",
             "value": "false"