diff --git a/docs/configuration.md b/docs/configuration.md
index 1054dcfddc..0f1a10b11b 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -191,3 +191,19 @@ Most of the following properties are designed for performance tuning. Adjusting
 * `decode_input_request`: Configuration to let backend workers to decode requests, when the content type is known.
 If this is set to "true", backend workers do "Bytearray to JSON object" conversion when the content type is "application/json" and
 the backend workers convert "Bytearray to utf-8 string" when the Content-Type of the request is set to "text*". Default: true  
+* `model_store` : Path of model store directory.
+* `model_server_home` : Torchserve home directory. 
+* `max_request_size` : The maximum allowable request size that the Torchserve accepts, in bytes. Default: 6553500
+* `max_response_size` : The maximum allowable response size that the Torchserve sends, in bytes. Default: 6553500
+
+---
+**NOTE**
+
+All the above config properties can be set using environment variable as follows.
+- set `enable_envvars_config` to true in config.properties
+- export environment variable for property as`TS_<PROPERTY_NAME>`. 
+
+  eg: to set inference_address property run cmd
+  `export TS_INFERENCE_ADDRESS="http://127.0.0.1:8082"`.
+
+---
diff --git a/frontend/server/src/main/java/org/pytorch/serve/snapshot/FSSnapshotSerializer.java b/frontend/server/src/main/java/org/pytorch/serve/snapshot/FSSnapshotSerializer.java
index 9ab9db0442..7f15b45b2b 100644
--- a/frontend/server/src/main/java/org/pytorch/serve/snapshot/FSSnapshotSerializer.java
+++ b/frontend/server/src/main/java/org/pytorch/serve/snapshot/FSSnapshotSerializer.java
@@ -25,7 +25,7 @@ public class FSSnapshotSerializer implements SnapshotSerializer {
 
     private Logger logger = LoggerFactory.getLogger(FSSnapshotSerializer.class);
     private ConfigManager configManager = ConfigManager.getInstance();
-    private static final String TS_MODEL_SNAPSHOT = "model_snapshot";
+    private static final String MODEL_SNAPSHOT = "model_snapshot";
     public static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
 
     @Override
@@ -43,7 +43,7 @@ public void saveSnapshot(Snapshot snapshot) throws IOException {
         }
 
         String snapshotJson = GSON.toJson(snapshot, Snapshot.class);
-        prop.put(TS_MODEL_SNAPSHOT, snapshotJson);
+        prop.put(MODEL_SNAPSHOT, snapshotJson);
         try (OutputStream os = Files.newOutputStream(snapshotFile.toPath())) {
             OutputStreamWriter osWriter = new OutputStreamWriter(os, StandardCharsets.UTF_8);
             prop.store(osWriter, "Saving snapshot");
diff --git a/frontend/server/src/main/java/org/pytorch/serve/util/ConfigManager.java b/frontend/server/src/main/java/org/pytorch/serve/util/ConfigManager.java
index cd6c6331a7..076f106c74 100644
--- a/frontend/server/src/main/java/org/pytorch/serve/util/ConfigManager.java
+++ b/frontend/server/src/main/java/org/pytorch/serve/util/ConfigManager.java
@@ -73,16 +73,16 @@ public final class ConfigManager {
     private static final String TS_MAX_REQUEST_SIZE = "max_request_size";
     private static final String TS_MAX_RESPONSE_SIZE = "max_response_size";
     private static final String TS_DEFAULT_SERVICE_HANDLER = "default_service_handler";
-    private static final String MODEL_SERVER_HOME = "model_server_home";
+    private static final String TS_MODEL_SERVER_HOME = "model_server_home";
     private static final String TS_MODEL_STORE = "model_store";
     private static final String TS_SNAPSHOT_STORE = "snapshot_store";
-    private static final String TS_MODEL_SNAPSHOT = "model_snapshot";
 
     // Configuration which are not documented or enabled through environment variables
     private static final String USE_NATIVE_IO = "use_native_io";
     private static final String IO_RATIO = "io_ratio";
     private static final String METRIC_TIME_INTERVAL = "metric_time_interval";
     private static final String ENABLE_ENVVARS_CONFIG = "enable_envvars_config";
+    private static final String MODEL_SNAPSHOT = "model_snapshot";
     private static final String VERSION = "version";
 
     // Variables which are local
@@ -317,11 +317,11 @@ public int getMetricTimeInterval() {
     }
 
     public String getModelServerHome() {
-        String tsHome = System.getenv("MODEL_SERVER_HOME");
+        String tsHome = System.getenv("TS_MODEL_SERVER_HOME");
         if (tsHome == null) {
-            tsHome = System.getProperty(MODEL_SERVER_HOME);
+            tsHome = System.getProperty(TS_MODEL_SERVER_HOME);
             if (tsHome == null) {
-                tsHome = getProperty(MODEL_SERVER_HOME, null);
+                tsHome = getProperty(TS_MODEL_SERVER_HOME, null);
                 if (tsHome == null) {
                     tsHome = getCanonicalPath(findTsHome());
                     return tsHome;
@@ -350,7 +350,7 @@ public String getSnapshotStore() {
     }
 
     public String getModelSnapshot() {
-        return prop.getProperty(TS_MODEL_SNAPSHOT, null);
+        return prop.getProperty(MODEL_SNAPSHOT, null);
     }
 
     public String getLoadModels() {