diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/stormond.json b/src/sonic-yang-models/tests/yang_model_tests/tests/stormond.json
index 5bdf492c738e..e484a317cd88 100644
--- a/src/sonic-yang-models/tests/yang_model_tests/tests/stormond.json
+++ b/src/sonic-yang-models/tests/yang_model_tests/tests/stormond.json
@@ -12,10 +12,10 @@
     },
     "STORMOND_POLLING_INTVL_BAD_LEN_MAX": {
         "desc": "Configure an invalid daemon polling interval: out of range value",
-        "eStrKey" : "Pattern"
+        "eStrKey" : "InvalidValue"
     },
     "STORMOND_SYNC_INTVL_BAD_LEN_MAX": {
         "desc": "Configure an invalid fsstats file sync interval: out of range value",
-        "eStrKey" : "Pattern"
+        "eStrKey" : "InvalidValue"
     }
 }
\ No newline at end of file
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/stormond.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/stormond.json
index 2ec6fe1e0394..c428b69b6ca5 100644
--- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/stormond.json
+++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/stormond.json
@@ -14,7 +14,7 @@
         "sonic-stormond-config:sonic-stormond-config": {
             "sonic-stormond-config:STORMOND_CONFIG": {
                 "INTERVALS":{
-                    "daemon_polling_interval" : "",
+                    "daemon_polling_interval" : "-1",
                     "fsstats_sync_interval"   : "86400"
 
                 }
@@ -26,7 +26,7 @@
             "sonic-stormond-config:STORMOND_CONFIG": {
                 "INTERVALS":{
                     "daemon_polling_interval" : "3600",
-                    "fsstats_sync_interval"   : ""
+                    "fsstats_sync_interval"   : "five_thousand_two_hundred_seconds"
 
                 }
             }
diff --git a/src/sonic-yang-models/yang-models/sonic-stormond-config.yang b/src/sonic-yang-models/yang-models/sonic-stormond-config.yang
index b05aca04363f..d6c8126ad0a6 100644
--- a/src/sonic-yang-models/yang-models/sonic-stormond-config.yang
+++ b/src/sonic-yang-models/yang-models/sonic-stormond-config.yang
@@ -22,14 +22,14 @@ module sonic-stormond-config{
                 leaf daemon_polling_interval {
                     description "Polling inerval for Storage Monitoring Daemon in STORMOND_CONFIG table";
                     type string {
-                        length 1..32;
+                        length 1..86400;
                     }
                 }
 
                 leaf fsstats_sync_interval {
                     description "FSSTATS JSON file syncing interval for the Storage Monitoring Daemon in STORMOND_CONFIG table";
                     type string {
-                        length 1..32;
+                        length 1..604800;
                     }
                 }
             }