diff --git a/.drone.star b/.drone.star
index b72a3aed527..187704faa0a 100644
--- a/.drone.star
+++ b/.drone.star
@@ -1637,12 +1637,12 @@ def ocisServerWithAccounts(storage, accounts_hash_difficulty = 4, volumes = [],
         "LDAP_INSECURE": "true",
         "LDAP_BIND_DN": "cn=admin,dc=ocis,dc=test",
         "LDAP_BIND_PASSWORD": "admin",
-        "LDAP_USER_BASE_DN": "ou=users,dc=ocis,dc=test",
+        "LDAP_USER_BASE_DN": "dc=ocis,dc=test",
         "LDAP_USER_SCHEMA_ID": "ownclouduuid",
         "LDAP_USER_SCHEMA_MAIL": "mail",
         "LDAP_USER_SCHEMA_USERNAME": "cn",
         "LDAP_USER_OBJECTCLASS": "posixAccount",
-        "LDAP_GROUP_BASE_DN": "ou=groups,dc=ocis,dc=test",
+        "LDAP_GROUP_BASE_DN": "dc=ocis,dc=test",
         "LDAP_GROUP_SCHEMA_ID": "cn",
         "LDAP_GROUP_SCHEMA_MAIL": "mail",
         "LDAP_GROUP_SCHEMA_GROUPNAME": "cn",
@@ -1660,8 +1660,10 @@ def ocisServerWithAccounts(storage, accounts_hash_difficulty = 4, volumes = [],
         "IDP_INSECURE": "true",
         "OCIS_LOG_LEVEL": "error",
         "OCIS_URL": "https://ocis-server:9200",
+        "ACCOUNTS_DEMO_USERS_AND_GROUPS": True,
         "STORAGE_HOME_DRIVER": "%s" % (storage),
         "STORAGE_USERS_DRIVER": "%s" % (storage),
+        "WEB_UI_CONFIG": "/drone/src/tests/config/drone/ocis-config.json",
     }
 
     # Pass in "default" accounts_hash_difficulty to not set this environment variable.
@@ -1685,11 +1687,11 @@ def ocisServerWithAccounts(storage, accounts_hash_difficulty = 4, volumes = [],
         },
         {
             "name": "wait-for-ocis-server",
-            "image": OC_CI_WAIT_FOR,
+            "image": OC_CI_ALPINE,
             "commands": [
-                "wait-for -it ocis-server:9200 -t 300",
+                "curl -k -u admin:admin --fail --retry-connrefused --retry 10 --retry-all-errors 'https://ocis-server:9200/graph/v1.0/users/ddc2004c-0977-11eb-9d3f-a793888cd0f8'",
             ],
-            "depends_on": [],
+            "depends_on": depends_on,
         },
     ]