diff --git a/meta-facebook/recipes-phosphor/health/files/bmc_health_config.json b/meta-facebook/recipes-phosphor/health/files/bmc_health_config.json
index 545186f..e66dc88 100644
--- a/meta-facebook/recipes-phosphor/health/files/bmc_health_config.json
+++ b/meta-facebook/recipes-phosphor/health/files/bmc_health_config.json
@@ -1,60 +1,68 @@
 {
-  "CPU" : {
-    "Frequency" : 1,
-    "Window_size": 120,
-    "Threshold":
-    {
-        "Critical_Upper":
-        {
-            "Value": "CPU_CRIT_VAL",
-            "Log": true,
-            "Target": "CPU_CRIT_TGT"
-        },
-        "Warning_Upper":
-        {
-            "Value": "CPU_WARN_VAL",
-            "Log": true,
-            "Target": "CPU_WARN_TGT"
+    "CPU": {
+        "Frequency": 1,
+        "Window_size": 120,
+        "Threshold": {
+            "Critical_Upper": {
+                "Value": "CPU_CRIT_VAL",
+                "Log": true,
+                "Target": "CPU_CRIT_TGT"
+            },
+            "Warning_Upper": {
+                "Value": "CPU_WARN_VAL",
+                "Log": true,
+                "Target": "CPU_WARN_TGT"
+            }
+        }
+    },
+    "Memory_Available": {
+        "Frequency": 1,
+        "Window_size": 120,
+        "Threshold": {
+            "Critical_Lower": {
+                "Value": "MEM_CRIT_VAL",
+                "Log": true,
+                "Target": "MEM_CRIT_TGT"
+            },
+            "Warning_Lower": {
+                "Value": "MEM_WARN_VAL",
+                "Log": true,
+                "Target": "MEM_WARN_TGT"
+            }
+        }
+    },
+    "Storage_RW": {
+        "Path": "/run/mnt-persist",
+        "Frequency": 1,
+        "Window_size": 120,
+        "Threshold": {
+            "Critical_Lower": {
+                "Value": "STORAGE_CRIT_VAL",
+                "Log": true,
+                "Target": "STORAGE_CRIT_TGT"
+            },
+            "Warning_Lower": {
+                "Value": "STORAGE_WARN_VAL",
+                "Log": true,
+                "Target": "STORAGE_WARN_TGT"
+            }
+        }
+    },
+    "Storage_TMP": {
+        "Path": "/tmp",
+        "Frequency": 1,
+        "Window_size": 120,
+        "Threshold": {
+            "Critical_Lower": {
+                "Value": "MEM_CRIT_VAL",
+                "Log": true,
+                "Target": "MEM_CRIT_TGT"
+            },
+            "Warning_Lower": {
+                "Value": "MEM_WARN_VAL",
+                "Log": true,
+                "Target": "MEM_WARN_TGT"
+            }
         }
     }
-  },
-  "Memory" : {
-    "Frequency" : 1,
-    "Window_size": 120,
-    "Threshold":
-    {
-        "Critical_Upper":
-        {
-            "Value": "MEM_CRIT_VAL",
-            "Log": true,
-            "Target": "MEM_CRIT_TGT"
-        },
-        "Warning_Upper":
-        {
-            "Value": "MEM_WARN_VAL",
-            "Log": true,
-            "Target": "MEM_WARN_TGT"
-        }
-    }
-  },
-  "Storage_RW" : {
-    "Path" : "/run/initramfs/rw",
-    "Frequency" : 1,
-    "Window_size": 120,
-    "Threshold":
-    {
-        "Critical_Lower":
-        {
-            "Value": "STORAGE_CRIT_VAL",
-            "Log": true,
-            "Target": "STORAGE_CRIT_TGT"
-        },
-        "Warning_Lower":
-        {
-            "Value": "STORAGE_WARN_VAL",
-            "Log": true,
-            "Target": "STORAGE_WARN_TGT"
-        }
-    }
-  }
 }
diff --git a/meta-facebook/recipes-phosphor/health/phosphor-health-monitor_%.bbappend b/meta-facebook/recipes-phosphor/health/phosphor-health-monitor_%.bbappend
index ab47793..ced5877 100644
--- a/meta-facebook/recipes-phosphor/health/phosphor-health-monitor_%.bbappend
+++ b/meta-facebook/recipes-phosphor/health/phosphor-health-monitor_%.bbappend
@@ -7,9 +7,9 @@
 CPU_WARN_VAL ?= "80.0"
 CPU_WARN_TGT ?= ""
 
-MEM_CRIT_VAL ?= "85.0"
+MEM_CRIT_VAL ?= "10.0"
 MEM_CRIT_TGT ?= "reboot.target"
-MEM_WARN_VAL ?= "70.0"
+MEM_WARN_VAL ?= "15.0"
 MEM_WARN_TGT ?= ""
 
 STORAGE_CRIT_VAL ?= "5.0"