diff --git a/src/sonic-yang-models/setup.py b/src/sonic-yang-models/setup.py
index 6e998737636..a0104e89662 100644
--- a/src/sonic-yang-models/setup.py
+++ b/src/sonic-yang-models/setup.py
@@ -109,6 +109,7 @@ def run(self):
                          './yang-models/sonic-system-defaults.yang',
                          './yang-models/sonic-interface.yang',
                          './yang-models/sonic-kdump.yang',
+                         './yang-models/sonic-login_message.yang',
                          './yang-models/sonic-loopback-interface.yang',
                          './yang-models/sonic-lossless-traffic-pattern.yang',
                          './yang-models/sonic-mgmt_interface.yang',
@@ -174,6 +175,7 @@ def run(self):
                          './cvlyang-models/sonic-system-defaults.yang',
                          './cvlyang-models/sonic-interface.yang',
                          './cvlyang-models/sonic-kdump.yang',
+                         './cvlyang-models/sonic-login_message.yang',
                          './cvlyang-models/sonic-loopback-interface.yang',
                          './cvlyang-models/sonic-mgmt_interface.yang',
                          './cvlyang-models/sonic-mgmt_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 332172d925c..f30e0ec105a 100644
--- a/src/sonic-yang-models/tests/files/sample_config_db.json
+++ b/src/sonic-yang-models/tests/files/sample_config_db.json
@@ -1941,6 +1941,14 @@
                 "default_dynamic_th": "0",
                 "over_subscribe_ratio": "0"
             }
+        },
+        "LOGIN_MESSAGE": {
+            "pre_login": {
+                "message": "Pre-login message"
+            },
+            "post_login": {
+                "message": "Post-login message"
+            }
         }
     },
     "SAMPLE_CONFIG_DB_UNKNOWN": {
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/login_message.json b/src/sonic-yang-models/tests/yang_model_tests/tests/login_message.json
new file mode 100644
index 00000000000..b98300d0934
--- /dev/null
+++ b/src/sonic-yang-models/tests/yang_model_tests/tests/login_message.json
@@ -0,0 +1,8 @@
+{
+    "LOGIN_MESSAGE_PRE_TEST": {
+        "desc": "Pre-login message test."
+    },
+    "LOGIN_MESSAGE_POST_TEST": {
+        "desc": "Post-login message test."
+    }
+}
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/login_message.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/login_message.json
new file mode 100644
index 00000000000..c2716c0d841
--- /dev/null
+++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/login_message.json
@@ -0,0 +1,20 @@
+{
+    "LOGIN_MESSAGE_PRE_TEST": {
+        "sonic-login_message:sonic-login_message": {
+            "sonic-login_message:LOGIN_MESSAGE": {
+                "pre_login": {
+                    "message": "Pre"
+                }
+            }
+        }
+    },
+    "LOGIN_MESSAGE_POST_TEST": {
+        "sonic-login_message:sonic-login_message": {
+            "sonic-login_message:LOGIN_MESSAGE": {
+                "post_login": {
+                    "message": "Post"
+                }
+            }
+        }
+    }
+}
diff --git a/src/sonic-yang-models/yang-models/sonic-login_message.yang b/src/sonic-yang-models/yang-models/sonic-login_message.yang
new file mode 100644
index 00000000000..e85ec209036
--- /dev/null
+++ b/src/sonic-yang-models/yang-models/sonic-login_message.yang
@@ -0,0 +1,40 @@
+module sonic-login_message {
+
+    yang-version 1.1;
+
+    namespace "http://github.com/Azure/sonic-login_message";
+    prefix login_message;
+
+    description "LOGIN_MESSAGE YANG Module for SONiC-based OS";
+
+    revision 2022-03-21 {
+        description "First Revision";
+    }
+
+    container sonic-login_message {
+
+        container LOGIN_MESSAGE {
+
+            description "LOGIN_MESSAGE part of config_db.json";
+
+            container pre_login {
+
+                leaf message {
+                    type string;
+                }
+
+            }
+
+            container post_login {
+
+                leaf message {
+                    type string;
+                }
+
+            }
+        }
+        /* end of container LOGIN_MESSAGE */
+    }
+    /* end of top level container */
+}
+/* end of module sonic-login_message */