diff --git a/.drone.star b/.drone.star
index b875fd3854..ec3d8cbd52 100644
--- a/.drone.star
+++ b/.drone.star
@@ -226,8 +226,6 @@ def localApiTestsOcStorage(ctx, coreBranch = 'master', coreCommit = ''):
           'TEST_SERVER_URL': 'https://ocis-server:9200',
           'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/reva/',
           'SKELETON_DIR': '/srv/app/tmp/testing/data/apiSkeleton',
-          'TEST_EXTERNAL_USER_BACKENDS':'true',
-          'REVA_LDAP_HOSTNAME':'ldap',
           'TEST_OCIS':'true',
           'BEHAT_FILTER_TAGS': '~@skipOnOcis-OC-Storage',
           'PATH_TO_CORE': '/srv/app/testrunner'
@@ -300,7 +298,6 @@ def coreApiTests(ctx, coreBranch = 'master', coreCommit = '', part_number = 1, n
       },
     ],
     'services':
-      ldap() +
       redis(),
     'volumes': [
       {
@@ -350,7 +347,6 @@ def uiTestPipeline(suiteName, phoenixBranch = 'master', phoenixCommit = ''):
           'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/reva',
           'OCIS_SKELETON_DIR': '/srv/app/testing/data/webUISkeleton',
           'PHOENIX_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
-          'LDAP_SERVER_URL': 'ldap://ldap',
           'TEST_TAGS': 'not @skipOnOCIS and not @skip',
           'LOCAL_UPLOAD_DIR': '/uploads',
           'NODE_TLS_REJECT_UNAUTHORIZED': 0,
@@ -378,7 +374,6 @@ def uiTestPipeline(suiteName, phoenixBranch = 'master', phoenixCommit = ''):
       },
     ],
     'services':
-      ldap() +
       redis() +
       selenium(),
     'volumes': [
@@ -965,12 +960,7 @@ def ocisServer():
       'detach': True,
       'environment' : {
         'OCIS_LOG_LEVEL': 'debug',
-        'REVA_LDAP_HOSTNAME': 'ldap',
-        'REVA_LDAP_PORT': 636,
-        'REVA_LDAP_BIND_PASSWORD': 'admin',
-        'REVA_LDAP_BIND_DN': 'cn=admin,dc=owncloud,dc=com',
-        'REVA_LDAP_BASE_DN': 'dc=owncloud,dc=com',
-        'REVA_LDAP_SCHEMA_UID': 'uid',
+
         'REVA_STORAGE_HOME_DATA_TEMP_FOLDER': '/srv/app/tmp/',
         'REVA_STORAGE_LOCAL_ROOT': '/srv/app/tmp/reva/root',
         'REVA_STORAGE_OWNCLOUD_DATADIR': '/srv/app/tmp/reva/data',
@@ -981,16 +971,10 @@ def ocisServer():
         'REVA_STORAGE_OC_DATA_SERVER_URL': 'http://ocis-server:9164/data',
         'REVA_DATAGATEWAY_URL': 'https://ocis-server:9200/data',
         'REVA_FRONTEND_URL': 'https://ocis-server:9200',
-        'REVA_LDAP_USERFILTER': '(&(objectclass=posixAccount)(|(uid={{.OpaqueId}})(cn={{.OpaqueId}})))',
-        'REVA_LDAP_LOGINFILTER': '(&(objectclass=posixAccount)(|(uid={{login}})(cn={{login}})(mail={{login}})))',
         'PHOENIX_WEB_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
         'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/tests/config/drone/identifier-registration.yml',
         'KONNECTD_ISS': 'https://ocis-server:9200',
         'KONNECTD_TLS': 'true',
-        'LDAP_URI': 'ldap://ldap',
-        'LDAP_BINDDN': 'cn=admin,dc=owncloud,dc=com',
-        'LDAP_BINDPW': 'admin',
-        'LDAP_BASEDN': 'dc=owncloud,dc=com'
       },
       'commands': [
         'apk add mailcap', # install /etc/mime.types
@@ -1026,21 +1010,6 @@ def cloneCoreRepos(coreBranch, coreCommit):
     }
   ]
 
-def ldap():
-  return [
-    {
-      'name': 'ldap',
-      'image': 'osixia/openldap',
-      'pull': 'always',
-      'environment': {
-        'LDAP_DOMAIN': 'owncloud.com',
-        'LDAP_ORGANISATION': 'ownCloud',
-        'LDAP_ADMIN_PASSWORD': 'admin',
-        'LDAP_TLS_VERIFY_CLIENT': 'never',
-      },
-    }
-  ]
-
 def redis():
   return [
     {