diff --git a/.composer.json b/.composer.json
index 1dfc328d03..a71d6b45b9 100644
--- a/.composer.json
+++ b/.composer.json
@@ -8,8 +8,9 @@
   "replace": {
   },
   "scripts": {
+    "lint:phpstan": "../../bin/phpstan analyse",
     "lint": [
-      "../../bin/phpstan analyse"
+      "@lint:phpstan"
     ]
   },
   "suggest": {
diff --git a/Readme.rst b/Readme.rst
index b990c058c7..82bf0a2e83 100644
--- a/Readme.rst
+++ b/Readme.rst
@@ -54,6 +54,7 @@ Contributing
 
 If you want to contribute to Flow Framework and want to set up a development environment, then follow these steps:
 
+Clone and install the flow dev distribution https://github.com/neos/flow-development-distribution via git and composer or use this shorthand:
 ``composer create-project neos/flow-development-distribution flow-development @dev --keep-vcs``
 
 Note the **-distribution** package you create a project from, instead of just checking out this repository.
@@ -65,8 +66,8 @@ Here you can do all Git-related work (``git add .``, ``git commit``, etc).
 
 Unit tests can be run here via ``../../bin/phpunit -c ../../Build/BuildEssentials/PhpUnit/UnitTests.xml``, functional tests via ``../../bin/phpunit -c ../../Build/BuildEssentials/PhpUnit/FunctionalTests.xml`` and static analysis via ``composer lint``.
 
-To switch the branch you intend to work on:
-``git checkout 6.3 && composer update``
+To switch the branch you intend to work on run this command in the root of the dev distribution:
+``git checkout 8.3 && composer update``
 
 .. note:: We use an upmerging strategy, so create all bugfixes to lowest maintained branch that
 contains the issue (typically the second last LTS release, check the diagram on
diff --git a/composer.json b/composer.json
index 4698b9044b..2200fcf8df 100644
--- a/composer.json
+++ b/composer.json
@@ -64,8 +64,9 @@
         "neos/utility-unicode": "self.version"
     },
     "scripts": {
+        "lint:phpstan": "../../bin/phpstan analyse",
         "lint": [
-            "../../bin/phpstan analyse"
+            "@lint:phpstan"
         ]
     },
     "suggest": {