diff --git a/.editorconfig b/.editorconfig
index 12bcb27e4ee7bbca7f74423a87d205926d2ad1d2..ccc6a281e51a2f99832b3c2d5b7b42b3ce84c36e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,6 +12,3 @@ indent_size = 2
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-
-[{composer.json,composer.lock}]
-indent_size = 4
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d06804671fb3de6d0c25fba46e1c5a3975ba9050..1d234297765c87ae1bd91b78b1c00083d4047fc0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
 include:
-  - project: 'gitlab-ci-cd/composer-packages'
+  - project: 'gitlab-ci-cd/drupal'
     ref: main
-    file: '/composer-packages.yml'
+    file: '/private-modules.yml'
diff --git a/composer.json b/composer.json
index ace5b1b8e2d1f2fed2edcf70ab38c9667f204c3a..d683c741c22257d9020fb3f213e6e03261854398 100644
--- a/composer.json
+++ b/composer.json
@@ -1,61 +1,53 @@
 {
-    "name": "lakedrops/dorgflow",
-    "description": "Composer Plugin for development environments",
-    "type": "composer-plugin",
-    "keywords": ["Development"],
-    "homepage": "https://gitlab.lakedrops.com/composer/plugin/dorgflow",
-    "license": "GPL-2.0-or-later",
-    "authors": [
-        {
-            "name": "Jürgen Haas",
-            "email": "juergen.haas@lakedrops.com",
-            "homepage": "https://www.lakedrops.com",
-            "role": "Drupal Expert"
-        },
-        {
-            "name": "Daniel Speicher",
-            "email": "daniel.speicher@lakedrops.com",
-            "homepage": "https://www.lakedrops.com",
-            "role": "Drupal Expert"
-        },
-        {
-            "name": "Richard Papp",
-            "email": "richard.papp@lakedrops.com",
-            "homepage": "https://www.lakedrops.com",
-            "role": "Drupal Expert"
-        }
-    ],
-    "support": {
-        "issues": "https://gitlab.lakedrops.com/composer/plugin/dorgflow/issues",
-        "source": "https://gitlab.lakedrops.com/composer/plugin/dorgflow/tree/main",
-        "docs": "https://devops-tools.docs.lakedrops.com/composer/plugin/dorgflow/"
+  "name": "lakedrops/dorgflow",
+  "description": "Composer Plugin for development environments",
+  "type": "composer-plugin",
+  "keywords": [
+    "Development"
+  ],
+  "homepage": "https://gitlab.lakedrops.com/composer/plugin/dorgflow",
+  "license": "GPL-2.0-or-later",
+  "authors": [
+    {
+      "name": "Jürgen Haas",
+      "email": "juergen.haas@lakedrops.com",
+      "homepage": "https://www.lakedrops.com",
+      "role": "Drupal Expert"
     },
-    "require": {
-        "php": ">=7.4",
-        "composer-plugin-api": "^1||^2",
-        "cypresslab/gitelephant": "^2.0|^4.0",
-        "lakedrops/composer-json-utils": "^2.4||dev-develop"
+    {
+      "name": "Daniel Speicher",
+      "email": "daniel.speicher@lakedrops.com",
+      "homepage": "https://www.lakedrops.com",
+      "role": "Drupal Expert"
     },
-    "require-dev": {
-        "composer/composer": "^1||^2",
-        "drupal/coder": "^8.3",
-        "phpunit/phpunit": "^9.5",
-        "roave/security-advisories": "dev-master",
-        "squizlabs/php_codesniffer": "^3.7"
-    },
-    "config": {
-        "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true
-        }
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "autoload": {
-        "psr-4": {
-            "LakeDrops\\DorgFlow\\": "src/"
-        }
-    },
-    "extra": {
-        "class": "LakeDrops\\DorgFlow\\Plugin"
+    {
+      "name": "Richard Papp",
+      "email": "richard.papp@lakedrops.com",
+      "homepage": "https://www.lakedrops.com",
+      "role": "Drupal Expert"
+    }
+  ],
+  "support": {
+    "issues": "https://gitlab.lakedrops.com/composer/plugin/dorgflow/issues",
+    "source": "https://gitlab.lakedrops.com/composer/plugin/dorgflow/tree/main",
+    "docs": "https://devops-tools.docs.lakedrops.com/composer/plugin/dorgflow/"
+  },
+  "require": {
+    "php": ">=8.1",
+    "composer-plugin-api": "^2",
+    "cypresslab/gitelephant": "^2.0|^4.0",
+    "lakedrops/composer-json-utils": "^2.5||dev-develop"
+  },
+  "require-dev": {
+    "composer/composer": "^2",
+    "roave/security-advisories": "dev-latest"
+  },
+  "autoload": {
+    "psr-4": {
+      "LakeDrops\\DorgFlow\\": "src/"
     }
+  },
+  "extra": {
+    "class": "LakeDrops\\DorgFlow\\Plugin"
+  }
 }
diff --git a/src/CommandProvider.php b/src/CommandProvider.php
index f8a810af8d23d92cd12a61578299753f36d529f5..7f1b19b558d5d87dcb79a5e133590925acb2be07 100644
--- a/src/CommandProvider.php
+++ b/src/CommandProvider.php
@@ -4,6 +4,11 @@ namespace LakeDrops\DorgFlow;
 
 use Composer\Plugin\Capability\CommandProvider as CommandProviderCapability;
 
+/**
+ * Composer Command Provider for DorgFlow.
+ *
+ * @package LakeDrops\DorgFlow
+ */
 class CommandProvider implements CommandProviderCapability {
 
   /**
@@ -15,4 +20,5 @@ class CommandProvider implements CommandProviderCapability {
       new IssueForkCommand(),
     ];
   }
+
 }
diff --git a/src/IssueForkCommand.php b/src/IssueForkCommand.php
index 8fc3d54af476b577a0f4e8b5aaebe3f715530f7a..369922990cbf1a00b623f4b12e89529b9db2659a 100644
--- a/src/IssueForkCommand.php
+++ b/src/IssueForkCommand.php
@@ -7,6 +7,11 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+/**
+ * Composer Issue Fork Command for DorgFlow.
+ *
+ * @package LakeDrops\DorgFlow
+ */
 class IssueForkCommand extends BaseCommand {
 
   /**
diff --git a/src/Plugin.php b/src/Plugin.php
index ac89043a3792994468fcd55a3dc1d1a15b515030..826aa4f399e374f4adf0719d3065c439f042397e 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -2,6 +2,7 @@
 
 namespace LakeDrops\DorgFlow;
 
+use Composer\Plugin\Capability\CommandProvider as ComposerCommandProvider;
 use Composer\Script\Event;
 use Composer\Script\ScriptEvents;
 use LakeDrops\Component\Composer\BasePlugin;
@@ -23,7 +24,7 @@ class Plugin extends BasePlugin {
    */
   public function getCapabilities(): array {
     return [
-      \Composer\Plugin\Capability\CommandProvider::class => CommandProvider::class,
+      ComposerCommandProvider::class => CommandProvider::class,
     ];
   }
 
@@ -31,10 +32,10 @@ class Plugin extends BasePlugin {
    * {@inheritdoc}
    */
   public static function getSubscribedEvents(): array {
-    return array(
+    return [
       ScriptEvents::POST_INSTALL_CMD => 'prepareDevProjects',
       ScriptEvents::POST_UPDATE_CMD => 'prepareDevProjects',
-    );
+    ];
   }
 
   /**
@@ -44,11 +45,10 @@ class Plugin extends BasePlugin {
    *   The event that triggered the call of this function.
    */
   public function prepareDevProjects(Event $event): void {
-    /** @var Handler $handler */
+    /** @var \LakeDrops\DorgFlow\Handler $handler */
     $handler = $this->handler;
-    $handler
-      ->setEvent($event)
-      ->prepareDevProjects();
+    $handler->setEvent($event);
+    $handler->prepareDevProjects();
   }
 
 }
diff --git a/src/PrepareCommand.php b/src/PrepareCommand.php
index 6dfa3c5fcda34fa4d1e9f7aee3678581f191458d..ece7ce34b30ff6346aa155d1d0a00c2d3e45fa82 100644
--- a/src/PrepareCommand.php
+++ b/src/PrepareCommand.php
@@ -6,6 +6,11 @@ use LakeDrops\Component\Composer\BaseCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+/**
+ * Composer Prepare Command for DorgFlow.
+ *
+ * @package LakeDrops\DorgFlow
+ */
 class PrepareCommand extends BaseCommand {
 
   /**