diff --git a/.drone.yml b/.drone.yml
index 986d1c41..79257938 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -27,12 +27,12 @@ steps:
     image: nextcloudci/php7.2:php7.2-9
     commands:
       - composer install
-      - ./composer/bin/parallel-lint --exclude ./composer/ .
+      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
   - name: syntax-php7.3
     image: nextcloudci/php7.3:php7.3-5
     commands:
       - composer install
-      - ./composer/bin/parallel-lint --exclude ./composer/ .
+      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
 trigger:
   branch:
     - master
@@ -50,9 +50,9 @@ steps:
     CORE_BRANCH: stable20
     DB: sqlite
   commands:
+    - composer install
     - bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB
     - cd ../server/apps/$APP_NAME
-    - composer install
     - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
 trigger:
   branch:
@@ -71,9 +71,9 @@ steps:
     CORE_BRANCH: stable20
     DB: mysql
   commands:
+    - composer install
     - bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB
     - cd ../server/apps/$APP_NAME
-    - composer install
     - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
 services:
 - name: mysql
@@ -101,9 +101,9 @@ steps:
     CORE_BRANCH: stable20
     DB: postgres
   commands:
+    - composer install
     - bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB
     - cd ../server/apps/$APP_NAME
-    - composer install
     - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
 services:
 - name: postgres
diff --git a/.gitignore b/.gitignore
index 3bc6f2af..3dbe6f74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ js/
 node_modules/
 vendor/
 img/twemoji/
-composer/
 
 cypress/screenshots
 cypress/snapshots
diff --git a/composer.json b/composer.json
index a2b5143e..2a6532ba 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,6 @@
     "platform": {
       "php": "7.0.0"
     },
-    "vendor-dir": "composer/",
     "optimize-autoloader": true,
     "classmap-authoritative": true,
     "autoloader-suffix": "Social"
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 87301824..0f7eab91 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -46,6 +46,7 @@ use OCP\AppFramework\QueryException;
 use OCP\IServerContainer;
 use Throwable;
 
+require_once __DIR__ . '/../../vendor/autoload.php';
 
 /**
  * Class Application
diff --git a/lib/hostmeta.php b/lib/hostmeta.php
index 00e56d94..ef130a3f 100644
--- a/lib/hostmeta.php
+++ b/lib/hostmeta.php
@@ -34,7 +34,7 @@ use OC;
 use OCA\Social\Service\ConfigService;
 use OCA\Social\Service\FediverseService;
 
-require_once(__DIR__ . '/../composer/autoload.php');
+require_once(__DIR__ . '/../vendor/autoload.php');
 
 try {
 	$fediverseService = OC::$server->query(FediverseService::class);
diff --git a/lib/webfinger.php b/lib/webfinger.php
index ba5849e2..2c65be71 100644
--- a/lib/webfinger.php
+++ b/lib/webfinger.php
@@ -37,7 +37,7 @@ use OCA\Social\Service\ConfigService;
 use OCA\Social\Service\FediverseService;
 use OCP\AppFramework\QueryException;
 
-require_once(__DIR__ . '/../composer/autoload.php');
+require_once(__DIR__ . '/../vendor/autoload.php');
 
 if (!array_key_exists('resource', $_GET)) {
 	echo 'missing resource';
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index bf2dc153..0db0e40a 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,7 +1,7 @@
 <?php
 
 require_once __DIR__ . '/../../../tests/bootstrap.php';
-require_once __DIR__.'/../composer/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 OC_App::loadApp('social');
 OC_Hook::clear();