diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json
index d8f9028409..cee594b236 100644
--- a/src/sonic-yang-models/tests/files/sample_config_db.json
+++ b/src/sonic-yang-models/tests/files/sample_config_db.json
@@ -1465,7 +1465,8 @@
                 "has_timer": "False",
                 "high_mem_alert": "disabled",
                 "state": "enabled",
-                "set_owner": "local"
+                "set_owner": "local",
+                "check_up_status": "False"
             },
             "database": {
                 "auto_restart": "always_enabled",
@@ -1474,7 +1475,8 @@
                 "has_timer": "false",
                 "high_mem_alert": "disabled",
                 "state": "always_enabled",
-                "set_owner": "local"
+                "set_owner": "local",
+                "check_up_status": "false"
             },
             "snmp": {
                 "auto_restart": "enabled",
@@ -1483,7 +1485,8 @@
                 "has_timer": "true",
                 "high_mem_alert": "disabled",
                 "state": "enabled",
-                "set_owner": "kube"
+                "set_owner": "kube",
+                "check_up_status": "true"
             },
             "swss": {
                 "auto_restart": "enabled",
@@ -1492,7 +1495,8 @@
                 "has_timer": "false",
                 "high_mem_alert": "disabled",
                 "state": "enabled",
-                "set_owner": "local"
+                "set_owner": "local",
+                "check_up_status": "false"
             },
             "syncd": {
                 "auto_restart": "enabled",
@@ -1501,7 +1505,8 @@
                 "has_timer": "false",
                 "high_mem_alert": "disabled",
                 "state": "enabled",
-                "set_owner": "local"
+                "set_owner": "local",
+                "check_up_status": "false"
             },
             "lldp": {
                 "auto_restart": "enabled",
@@ -1510,7 +1515,8 @@
                 "has_timer": "false",
                 "high_mem_alert": "disabled",
                 "state": "enabled",
-                "set_owner": "kube"
+                "set_owner": "kube",
+                "check_up_status": "false"
             },
             "dhcp_relay": {
                 "auto_restart": "enabled",
@@ -1519,7 +1525,8 @@
                 "has_timer": "false",
                 "high_mem_alert": "disabled",
                 "state": "{% if not (DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['type'] is defined and DEVICE_METADATA['localhost']['type'] != 'ToRRouter') %}enabled{% else %}disabled{% endif %}",
-                "set_owner": "kube"
+                "set_owner": "kube",
+                "check_up_status": "true"
             }
         },
         "DHCP_RELAY": {
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/feature.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/feature.json
index 82e403cb14..08c974d8e4 100644
--- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/feature.json
+++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/feature.json
@@ -10,7 +10,8 @@
                         "has_timer": "False",
                         "has_global_scope": "True",
                         "has_per_asic_scope": "True",
-                        "set_owner": "local"
+                        "set_owner": "local",
+                        "check_up_status": "False"
                     },
                     {
                         "name": "swss",
@@ -19,7 +20,8 @@
                         "has_timer": "false",
                         "has_global_scope": "false",
                         "has_per_asic_scope": "true",
-                        "set_owner": "local"
+                        "set_owner": "local",
+                        "check_up_status": "false"
                     },
                     {
                         "name": "syncd",
@@ -28,7 +30,8 @@
                         "has_timer": "false",
                         "has_global_scope": "false",
                         "has_per_asic_scope": "true",
-                        "set_owner": "local"
+                        "set_owner": "local",
+                        "check_up_status": "false"
                     },
                     {
                         "name": "snmp",
@@ -37,7 +40,8 @@
                         "has_timer": "false",
                         "has_global_scope": "true",
                         "has_per_asic_scope": "false",
-                        "set_owner": "kube"
+                        "set_owner": "kube",
+                        "check_up_status": "false"
                     },
                     {
                         "name": "lldp",
@@ -46,7 +50,8 @@
                         "has_timer": "false",
                         "has_global_scope": "false",
                         "has_per_asic_scope": "true",
-                        "set_owner": "kube"
+                        "set_owner": "kube",
+                        "check_up_status": "false"
                     },
                     {
                         "name": "dhcp_relay",
@@ -55,7 +60,8 @@
                         "has_timer": "false",
                         "has_global_scope": "false",
                         "has_per_asic_scope": "true",
-                        "set_owner": "kube"
+                        "set_owner": "kube",
+                        "check_up_status": "false"
                     }
                 ]
             }
@@ -72,7 +78,8 @@
                         "has_timer": "false",
                         "has_global_scope": "false",
                         "has_per_asic_scope": "true",
-                        "set_owner": "invalid"
+                        "set_owner": "invalid",
+                        "check_up_status": "false"
                     }
                 ]
             }
@@ -88,7 +95,8 @@
                         "auto_restart": "disabled",
                         "has_timer": "false",
                         "has_global_scope": "false",
-                        "has_per_asic_scope": "true"
+                        "has_per_asic_scope": "true",
+                        "check_up_status": "false"
                     }
                 ]
             }
@@ -104,7 +112,8 @@
                         "auto_restart": "always_enabled",
                         "has_timer": "FALSE",
                         "has_global_scope": "TRUE",
-                        "has_per_asic_scope": "TRUE"
+                        "has_per_asic_scope": "TRUE",
+                        "check_up_status": "FALSE"
                     }
                 ]
             }