diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
index 92017a0206..8a993597f0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
@@ -68,7 +68,7 @@ public final class OzoneConfigKeys {
   public static final String OZONE_METADATA_STORE_IMPL_ROCKSDB =
       "RocksDB";
   public static final String OZONE_METADATA_STORE_IMPL_DEFAULT =
-      OZONE_METADATA_STORE_IMPL_LEVELDB;
+      OZONE_METADATA_STORE_IMPL_ROCKSDB;
 
   public static final String OZONE_KEY_CACHE = "ozone.key.cache.size";
   public static final int OZONE_KEY_CACHE_DEFAULT = 1024;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml
index 17a127d827..3575d5ec0e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml
@@ -35,7 +35,7 @@
 
   <property>
     <name>ozone.handler.type</name>
-    <value>local</value>
+    <value>distributed</value>
     <description>
       The second key dfs.storage.handler.type tells ozone which storage
       handler to use. The possible values are:
@@ -195,7 +195,7 @@
 
   <property>
     <name>ozone.scm.handler.count.key</name>
-    <value>20</value>
+    <value>10</value>
     <description>
       The number of RPC handler threads for each SCM service endpoint.