diff --git a/src/sonic-config-engine/tests/chassis_data/voq_chassis_data/voq_chassis_lc_multi_asic.xml b/src/sonic-config-engine/tests/chassis_data/voq_chassis_data/voq_chassis_lc_multi_asic.xml
index f19e6adbb716..2bbf8868da5e 100644
--- a/src/sonic-config-engine/tests/chassis_data/voq_chassis_data/voq_chassis_lc_multi_asic.xml
+++ b/src/sonic-config-engine/tests/chassis_data/voq_chassis_data/voq_chassis_lc_multi_asic.xml
@@ -44009,7 +44009,7 @@
                     <a:DeviceProperty>
                         <a:Name>MacSecEnabled</a:Name>
                         <a:Reference i:nil="true" />
-                        <a:Value>False</a:Value>
+                        <a:Value>True</a:Value>
                     </a:DeviceProperty>
                     <a:DeviceProperty>
                         <a:Name>OsVersion</a:Name>
@@ -48335,4 +48335,4 @@
     <HwSku>Sonic-400g-lc-sku</HwSku>
     <Version>1.0.1388.35297&#xD;
 </Version>
-</DeviceMiniGraph>
+</DeviceMiniGraph>
\ No newline at end of file
diff --git a/src/sonic-config-engine/tests/test_chassis_cfggen.py b/src/sonic-config-engine/tests/test_chassis_cfggen.py
index 8f7eee3f6908..83d4be6f3550 100644
--- a/src/sonic-config-engine/tests/test_chassis_cfggen.py
+++ b/src/sonic-config-engine/tests/test_chassis_cfggen.py
@@ -138,8 +138,7 @@ def test_device_metadata(self):
             'switch_type': 'voq',
             'switch_id': 20,
             'max_cores': 64,
-            'slice_type': 'AZNG_Production',
-            'sub_type': 'UpstreamLC'})
+            'slice_type': 'AZNG_Production'})
 
     def test_port(self):
         argument = ['-m', self.sample_graph, '-p',
@@ -446,8 +445,7 @@ def test_device_metadata(self):
             'deployment_id': '3',
             'cluster': 'TestbedForstr-sonic',
             'switch_type': 'voq',
-            'max_cores': 64,
-            'sub_type': 'DownstreamLC'})
+            'max_cores': 64})
 
     def test_device_metadata_for_namespace(self):
         argument = [
@@ -924,8 +922,7 @@ def test_device_metadata(self):
                 "cluster": "TestbedForstr-sonic",
                 "switch_type": "fabric",
                 "sub_role": "fabric",
-                "max_cores": 64,
-                "sub_type": "Supervisor"
+                "max_cores": 64
             }
         )
 
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json
index 44f0966c8b18..5d0e0201b4ff 100644
--- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json
+++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json
@@ -256,7 +256,7 @@
             }
         }
     },
-    "DEVICE_METADATA_VALID_SUBTYPE0": {
+    "DEVICE_METADATA_VALID_SUBTYPE": {
         "sonic-device_metadata:sonic-device_metadata": {
             "sonic-device_metadata:DEVICE_METADATA": {
                 "sonic-device_metadata:localhost": {
@@ -265,33 +265,6 @@
             }
         }
     },
-    "DEVICE_METADATA_VALID_SUBTYPE1": {
-        "sonic-device_metadata:sonic-device_metadata": {
-            "sonic-device_metadata:DEVICE_METADATA": {
-                "sonic-device_metadata:localhost": {
-                    "subtype": "Supervisor"
-                }
-            }
-        }
-    },
-    "DEVICE_METADATA_VALID_SUBTYPE2": {
-        "sonic-device_metadata:sonic-device_metadata": {
-            "sonic-device_metadata:DEVICE_METADATA": {
-                "sonic-device_metadata:localhost": {
-                    "subtype": "UpstreamLC"
-                }
-            }
-        }
-    },
-    "DEVICE_METADATA_VALID_SUBTYPE3": {
-        "sonic-device_metadata:sonic-device_metadata": {
-            "sonic-device_metadata:DEVICE_METADATA": {
-                "sonic-device_metadata:localhost": {
-                    "subtype": "DownstreamLC"
-                }
-            }
-        }
-    },
     "DEVICE_METADATA_INVALID_SUBTYPE": {
         "sonic-device_metadata:sonic-device_metadata": {
             "sonic-device_metadata:DEVICE_METADATA": {