diff --git a/src/sonic-yang-models/setup.py b/src/sonic-yang-models/setup.py
index c18d0c235668..17dcdeeaa5b4 100644
--- a/src/sonic-yang-models/setup.py
+++ b/src/sonic-yang-models/setup.py
@@ -166,6 +166,7 @@ def run(self):
                          './cvlyang-models/sonic-mgmt_vrf.yang',
                          './cvlyang-models/sonic-ntp.yang',
                          './cvlyang-models/sonic-nat.yang',
+                         './cvlyang-models/sonic-nvgre-tunnel.yang',
                          './cvlyang-models/sonic-pbh.yang',
                          './cvlyang-models/sonic-policer.yang',
                          './cvlyang-models/sonic-port.yang',
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 ee3620c13b79..6c27047c9bcf 100644
--- a/src/sonic-yang-models/tests/files/sample_config_db.json
+++ b/src/sonic-yang-models/tests/files/sample_config_db.json
@@ -1539,6 +1539,8 @@
 	          "pfc_enable"      : "3,4"
             }
         },
+
+
         "MCLAG_DOMAIN": {
             "123": {
                 "source_ip": "12.1.1.1",
@@ -1558,6 +1560,8 @@
                 "unique_ip": "enable"
             }
         },
+
+
         "MIRROR_SESSION": {
             "erspan": {
                 "dscp": "10",
diff --git a/src/sonic-yang-models/yang-models/sonic-nvgre-tunnel.yang b/src/sonic-yang-models/yang-models/sonic-nvgre-tunnel.yang
index f255b30964cb..42ab3921a4a2 100644
--- a/src/sonic-yang-models/yang-models/sonic-nvgre-tunnel.yang
+++ b/src/sonic-yang-models/yang-models/sonic-nvgre-tunnel.yang
@@ -13,7 +13,15 @@ module sonic-nvgre-tunnel {
         prefix vlan;
     }
 
-    description "NVGRE Tunnel YANG Module for SONiC OS";
+
+    organization
+        "SONiC";
+
+    contact
+        "SONiC";
+
+    description
+        "NVGRE Tunnel YANG Module for SONiC OS";
 
     revision 2021-10-31 {
         description