diff --git a/pom.xml b/pom.xml
index 8799ff687a8..970f6cbe457 100755
--- a/pom.xml
+++ b/pom.xml
@@ -475,6 +475,7 @@
               <exclude>conf/zeppelin-env.sh</exclude>
               <exclude>spark-*-bin*/**</exclude>
               <exclude>.spark-dist/**</exclude>
+              <exclude>**/interpreter-setting.json</exclude>
 
               <!-- bundled from bootstrap -->
               <exclude>docs/assets/themes/zeppelin/bootstrap/**</exclude>
diff --git a/shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java b/shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java
index e3c4d0c0f31..13312252654 100644
--- a/shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java
+++ b/shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java
@@ -45,27 +45,12 @@ public class ShellInterpreter extends Interpreter {
   Logger logger = LoggerFactory.getLogger(ShellInterpreter.class);
   private static final String EXECUTOR_KEY = "executor";
   public static final String SHELL_COMMAND_TIMEOUT = "shell.command.timeout.millisecs";
-  public static final String DEFAULT_COMMAND_TIMEOUT = "600000";
   int commandTimeOut;
   private static final boolean isWindows = System
           .getProperty("os.name")
           .startsWith("Windows");
   final String shell = isWindows ? "cmd /c" : "bash -c";
 
-  static {
-    Interpreter.register(
-            "sh",
-            "sh",
-            ShellInterpreter.class.getName(),
-            new InterpreterPropertyBuilder()
-              .add(
-                SHELL_COMMAND_TIMEOUT,
-                DEFAULT_COMMAND_TIMEOUT,
-                "Shell command time out in millisecs. Default = 600000")
-              .build()
-    );
-  }
-
   public ShellInterpreter(Properties property) {
     super(property);
   }
diff --git a/shell/src/main/resources/interpreter-setting.json b/shell/src/main/resources/interpreter-setting.json
new file mode 100644
index 00000000000..5e9a051a2eb
--- /dev/null
+++ b/shell/src/main/resources/interpreter-setting.json
@@ -0,0 +1,15 @@
+[
+  {
+    "group": "sh",
+    "name": "sh",
+    "className": "org.apache.zeppelin.shell.ShellInterpreter",
+    "properties": {
+      "shell.command.timeout.millisecs": {
+        "envName": "SHELL_COMMAND_TIMEOUT",
+        "propertyName": "shell.command.timeout.millisecs",
+        "defaultValue": "60000",
+        "description": "Shell command time out in millisecs. Default = 60000"
+      }
+    }
+  }
+]
\ No newline at end of file