diff --git a/Makefile b/Makefile
index 54930c6b6..9340fd83e 100644
--- a/Makefile
+++ b/Makefile
@@ -23,12 +23,15 @@ install-deps: install-deps-js
 install-deps-nodev: install-deps-js
 	composer install --no-dev
 
+autoloader:
+	composer dump-autoload
+
 install-deps-js:
 	npm ci
 
 build: clean-dist install-deps build-js
 
-release: clean-dist install-deps-nodev build-js
+release: clean-dist install-deps-nodev autoloader build-js
 
 build-js: install-deps-js
 	npm run build
diff --git a/appinfo/autoload.php b/appinfo/autoload.php
deleted file mode 100644
index 434b7b5a2..000000000
--- a/appinfo/autoload.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Deck\AppInfo;
-
-/**
- * Additional autoloader registration, e.g. registering composer autoloaders
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/composer.json b/composer.json
index aa6e79568..52240f96b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,31 +1,38 @@
 {
-    "name": "nextcloud/deck",
-    "type": "project",
-    "license": "AGPLv3",
-    "authors": [
-        {
-            "name": "Julius Härtl",
-            "email": "jus@bitgrid.net"
-        }
-    ],
-    "require": {
-        "cogpowered/finediff": "0.3.*"
-    },
-    "require-dev": {
-        "roave/security-advisories": "dev-master",
-        "christophwurst/nextcloud": "^17",
-        "jakub-onderka/php-parallel-lint": "^1.0.0",
-        "phpunit/phpunit": "^8",
-        "nextcloud/coding-standard": "^0.3.0",
-        "symfony/event-dispatcher": "^4.0"
-    },
-    "config": {
-        "optimize-autoloader": true,
-        "classmap-authoritative": true
-    },
-    "scripts": {
-        "lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
-        "cs:check": "php-cs-fixer fix --dry-run --diff",
-        "cs:fix": "php-cs-fixer fix"
-    }
+	"name": "nextcloud/deck",
+	"type": "project",
+	"license": "AGPLv3",
+	"authors": [
+		{
+			"name": "Julius Härtl",
+			"email": "jus@bitgrid.net"
+		}
+	],
+	"require": {
+		"cogpowered/finediff": "0.3.*"
+	},
+	"require-dev": {
+		"roave/security-advisories": "dev-master",
+		"christophwurst/nextcloud": "^17",
+		"jakub-onderka/php-parallel-lint": "^1.0.0",
+		"phpunit/phpunit": "^8",
+		"nextcloud/coding-standard": "^0.3.0",
+		"symfony/event-dispatcher": "^4.0"
+	},
+	"config": {
+		"optimize-autoloader": true,
+		"classmap-authoritative": true,
+		"vendor-dir": "composer",
+		"autoloader-suffix": "Deck"
+	},
+	"autoload" : {
+		"psr-4": {
+			"OCA\\Deck\\": "lib/"
+		}
+	},
+	"scripts": {
+		"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
+		"cs:check": "php-cs-fixer fix --dry-run --diff",
+		"cs:fix": "php-cs-fixer fix"
+	}
 }