diff --git a/jenkins/client/security/ldap.yml b/jenkins/client/security/ldap.yml
index 76126ed..ba53570 100644
--- a/jenkins/client/security/ldap.yml
+++ b/jenkins/client/security/ldap.yml
@@ -2,7 +2,9 @@
   _param:
     jenkins_security_ldap_manager_dn: ''
     jenkins_security_ldap_manager_password: ''
-    jenkins_security_ldap_user_search_filter: '(|(uid={0})(cn={0}))'
+    jenkins_security_ldap_user_search_filter: 'uid={0}'
+    jenkins_security_ldap_user_search_base: ''
+    jenkins_security_ldap_group_search_base: ''
   jenkins:
     client:
       security:
@@ -12,3 +14,5 @@
           manager_dn: ${_param:jenkins_security_ldap_manager_dn}
           manager_password: ${_param:jenkins_security_ldap_manager_password}
           user_search: ${_param:jenkins_security_ldap_user_search_filter}
+          user_search_base: ${_param:jenkins_security_ldap_user_search_base}
+          group_search_base: ${_param:jenkins_security_ldap_group_search_base}