diff --git a/docs-core/pom.xml b/docs-core/pom.xml
index 41a9866c..4b172b13 100644
--- a/docs-core/pom.xml
+++ b/docs-core/pom.xml
@@ -133,14 +133,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>bouncycastle</groupId>
-          <artifactId>bcprov-jdk15</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-all</artifactId>
     </dependency>
 
     <!-- Only there to read old index and rebuild them -->
diff --git a/docs-core/src/main/java/com/sismics/docs/core/util/authentication/LdapAuthenticationHandler.java b/docs-core/src/main/java/com/sismics/docs/core/util/authentication/LdapAuthenticationHandler.java
index d9ddd5da..ce3cdf3b 100644
--- a/docs-core/src/main/java/com/sismics/docs/core/util/authentication/LdapAuthenticationHandler.java
+++ b/docs-core/src/main/java/com/sismics/docs/core/util/authentication/LdapAuthenticationHandler.java
@@ -17,7 +17,7 @@ import org.apache.directory.api.ldap.model.message.SearchScope;
 import org.apache.directory.ldap.client.api.DefaultLdapConnectionFactory;
 import org.apache.directory.ldap.client.api.LdapConnectionConfig;
 import org.apache.directory.ldap.client.api.LdapConnectionPool;
-import org.apache.directory.ldap.client.api.PoolableLdapConnectionFactory;
+import org.apache.directory.ldap.client.api.ValidatingPoolableLdapConnectionFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -74,7 +74,7 @@ public class LdapAuthenticationHandler implements AuthenticationHandler {
         GenericObjectPool.Config poolConfig = new GenericObjectPool.Config();
         poolConfig.whenExhaustedAction = GenericObjectPool.WHEN_EXHAUSTED_GROW;
         poolConfig.maxWait = 500;
-        pool = new LdapConnectionPool(new PoolableLdapConnectionFactory(factory), poolConfig);
+        pool = new LdapConnectionPool(new ValidatingPoolableLdapConnectionFactory(factory), poolConfig);
     }
 
     @Override
diff --git a/pom.xml b/pom.xml
index b17875a8..eef39b28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
     <com.sun.mail.javax.mail.version>1.6.2</com.sun.mail.javax.mail.version>
     <org.jsoup.jsoup.version>1.11.3</org.jsoup.jsoup.version>
     <com.squareup.okhttp3.okhttp.version>3.11.0</com.squareup.okhttp3.okhttp.version>
-    <org.apache.directory.server.apacheds.version>2.0.0-M17</org.apache.directory.server.apacheds.version>
+    <org.apache.directory.api.api-all.version>1.0.0</org.apache.directory.api.api-all.version>
 
     <org.eclipse.jetty.jetty-server.version>9.4.17.v20190418</org.eclipse.jetty.jetty-server.version>
     <org.eclipse.jetty.jetty-webapp.version>9.4.17.v20190418</org.eclipse.jetty.jetty-webapp.version>
@@ -461,9 +461,9 @@
       </dependency>
 
       <dependency>
-        <groupId>org.apache.directory.server</groupId>
-        <artifactId>apacheds-core</artifactId>
-        <version>${org.apache.directory.server.apacheds.version}</version>
+        <groupId>org.apache.directory.api</groupId>
+        <artifactId>api-all</artifactId>
+        <version>${org.apache.directory.api.api-all.version}</version>
       </dependency>
 
       <!-- Servlet listener to register SPI ImageIO plugins -->