diff --git a/Test/Unit/phpunit.xml.dist b/Test/Unit/phpunit.xml.dist
deleted file mode 100644
index 408f61e..0000000
--- a/Test/Unit/phpunit.xml.dist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.0.1/phpunit.xsd"
-         colors="true"
-         bootstrap="../../../../../../dev/tests/unit/framework/bootstrap.php"
-        >
-    <testsuite name="Flagbit Flysystem All">
-        <directory suffix="Test.php">./</directory>
-    </testsuite>
-    <php>
-        <ini name="date.timezone" value="America/Los_Angeles"/>
-        <ini name="xdebug.max_nesting_level" value="200"/>
-    </php>
-    <filter>
-        <whitelist addUncoveredFilesFromWhiteList="true">
-            <directory suffix=".php">../../*</directory>
-            <exclude>
-                <directory suffix=".php">../../Test/*</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/composer.json b/composer.json
index 99253f7..40d0cbc 100644
--- a/composer.json
+++ b/composer.json
@@ -1,39 +1,59 @@
 {
-  "name": "flagbit/magento2-flysystem",
-  "description": "Flysystem integration for Magento2",
-  "type": "magento2-module",
-  "license": [
-    "proprietary"
-  ],
-  "authors": [
-    {
-      "name": "Robin Homberg",
-      "email": "robin.homberg@flagbit.de",
-      "role": "Developer"
-    },
-    {
-      "name": "Björn Meyer",
-      "email": "bjoern.meyer@flagbit.de",
-      "role": "DevOps"
-    }
-  ],
-  "require": {
-    "php": ">=7.1.0",
-    "league/flysystem": "1.0.43",
-    "league/flysystem-sftp": "^1.0"
-  },
-  "require-dev": {
-    "roave/security-advisories": "dev-master"
-  },
-  "autoload": {
-    "files": [
-      "registration.php"
+    "name": "flagbit/magento2-flysystem",
+    "description": "Flysystem integration for Magento2",
+    "type": "magento2-module",
+    "license": [
+        "GPL-3.0-or-later"
+    ],
+    "authors": [
+        {
+            "name": "Robin Homberg",
+            "email": "robin.homberg@flagbit.de",
+            "role": "Developer"
+        },
+        {
+            "name": "Björn Meyer",
+            "email": "bjoern.meyer@flagbit.de",
+            "role": "DevOps"
+        }
+    ],
+    "homepage": "https://github.com/flagbit/Magento2-Flysystem",
+    "keywords": [
+        "magento",
+        "magento2",
+        "flysystem",
+        "filesystem"
+    ],
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://repo.magento.com/"
+        }
     ],
-    "psr-4": {
-      "Flagbit\\Flysystem\\": ""
+    "require": {
+        "php": ">=7.1.0",
+        "league/flysystem": "^1.0",
+        "league/flysystem-sftp": "^1.0",
+        "magento/framework": ">=101.0.0",
+        "magento/module-backend": ">=100.2.0",
+        "magento/magento-composer-installer": "*"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^7.5",
+        "roave/security-advisories": "dev-master"
+    },
+    "suggest": {
+        "flagbit/magento2-flysystem-s3": "S3 Adapter for Magento2 Flysystem integration"
+    },
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Flagbit\\Flysystem\\": ""
+        }
+    },
+    "config": {
+        "sort-packages": true
     }
-  },
-  "config": {
-    "sort-packages": true
-  }
 }