diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 7c12a9835b79..d40e39333f5c 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -298,7 +298,7 @@ sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/bash-tacplus_*.deb || \
 # Install audisp-tacplus
 sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/audisp-tacplus_*.deb || \
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
-# Disable tacplus and LDAP y default
+# Disable tacplus and LDAP by default
 ## NOTE: this syntax of pam-auth-update is meant to be used when the package gets removed, not for specifying
 ## some local configuration of a PAM module. Currently, there's no clean way of noninteractively specifying
 ## whether some PAM module needs to be enabled or disabled on a system (there are hacky ways, though).
diff --git a/src/sonic-yang-models/yang-models/sonic-system-ldap.yang b/src/sonic-yang-models/yang-models/sonic-system-ldap.yang
index 9b603e8ea278..82fe4624005f 100644
--- a/src/sonic-yang-models/yang-models/sonic-system-ldap.yang
+++ b/src/sonic-yang-models/yang-models/sonic-system-ldap.yang
@@ -1,32 +1,12 @@
 module sonic-system-ldap {
     yang-version 1.1;
     namespace "http://github.com/Azure/sonic-system-ldap";
-    prefix ssys;
+    prefix ssys-ldap;
 
     import ietf-inet-types {
         prefix inet;
     }
 
-    import sonic-port {
-        prefix port;
-    }
-
-    import sonic-portchannel {
-        prefix lag;
-    }
-
-    import sonic-loopback-interface {
-        prefix loopback;
-    }
-
-    import sonic-interface {
-        prefix interface;
-    }
-
-    import sonic-mgmt_port {
-        prefix mgmt-port;
-    }
-
     description "LDAP YANG Module for SONiC OS";
 
     revision 2023-10-01 {
@@ -38,9 +18,9 @@ module sonic-system-ldap {
         container LDAP_SERVER {
             list LDAP_SERVER_LIST {
                 max-elements 8;
-                key "ipaddress";
+                key "hostname";
 
-                leaf ipaddress {
+                leaf hostname {
                     type inet:host;
                     description
                         "LDAP server's Domain name or IP address (IPv4 or IPv6)";
@@ -75,7 +55,7 @@ module sonic-system-ldap {
                     type string {
                         length "1..65";
                         pattern "[^ #,]*" {
-                            error-message 'TACACS shared secret (Valid chars are ASCII printable except SPACE, "#", and ",")';
+                            error-message 'LDAP shared secret (Valid chars are ASCII printable except SPACE, "#", and ",")';
                         }
                     }
                     description "Shared secret used for encrypting the communication";
@@ -111,7 +91,7 @@ module sonic-system-ldap {
                 leaf port {
                     type inet:port-number;
                     default 389;
-                    description "TCP port to communite with LDAP server";
+                    description "TCP port to communicate with LDAP server";
                 }
 
                 leaf timeout {