diff --git a/.github/actions/run-e2e/action.yml b/.github/actions/run-e2e/action.yml
index 974d3fee0..0cc6baa44 100644
--- a/.github/actions/run-e2e/action.yml
+++ b/.github/actions/run-e2e/action.yml
@@ -137,6 +137,13 @@ runs:
         docker exec shop bash -c 'php bin/console dal:validate'
 
     # --------------------------------------------------------------------------------------------------------------------------------------
+    - name: Integration Tests
+      shell: bash
+      run: |
+        docker exec shop bash -c 'cd /var/www/html/custom/plugins/MolliPayments && make phpintegration'
+    # --------------------------------------------------------------------------------------------------------------------------------------
+
+
 
     - name: Install Cypress
       if: ${{ inputs.RUN_CYPRESS == 'true' }}
diff --git a/.php_cs.php b/.php_cs.php
index 2bf465fe7..501ba9681 100644
--- a/.php_cs.php
+++ b/.php_cs.php
@@ -2,6 +2,7 @@
 
 $finder = \PhpCsFixer\Finder::create()->in([
     __DIR__ . '/src',
+    __DIR__ . '/shopware',
     __DIR__.'/tests/PHPUnit',
 ]);
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f90826c78..5e5f215a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,4 +10,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Features
 - Return over Shopware Commercial plugins is now transfered to Mollie when the Return status is set to "Done" and can be cancelled with the "Cancelled" status. Please note that the refund cannot be cancelled after two hours.
 ### Changes
-- Minimum Supported Shopware version is now 6.4.5.0
\ No newline at end of file
+- Minimum Supported Shopware version is now 6.4.5.0
+- Add new monolog channel "mollie". You can now add custom handler and assign them to the mollie channel
\ No newline at end of file
diff --git a/composer.json b/composer.json
index efd20eb58..68f824998 100644
--- a/composer.json
+++ b/composer.json
@@ -42,12 +42,15 @@
     },
     "autoload": {
         "psr-4": {
+            "Mollie\\Shopware\\": "shopware/",
             "Kiener\\MolliePayments\\": "src/",
             "Mollie\\Api\\": "vendor_manual/mollie/mollie-api-php/src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
+            "Mollie\\Unit\\": "tests/Unit/",
+            "Mollie\\Integration\\": "tests/Integration/",
             "MolliePayments\\Tests\\": "tests/PHPUnit/",
             "MolliePayments\\PHPStan\\": "tests/PHPStan/",
             "MolliePayments\\Fixtures\\": "tests/Fixtures/"
@@ -70,7 +73,7 @@
         "shopware/elasticsearch": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9",
         "phpstan/phpstan": "1.10.0",
         "friendsofphp/php-cs-fixer": "^2.18",
         "phpcompatibility/php-compatibility": "^9.3",
diff --git a/makefile b/makefile
index e2debaeff..a4f14671c 100644
--- a/makefile
+++ b/makefile
@@ -94,10 +94,13 @@ stan: ##2 Starts the PHPStan Analyser
 	@php vendor/bin/phpstan analyse -c ./.phpstan.neon
 
 phpunit: ##2 Starts all PHPUnit Tests
-	@XDEBUG_MODE=coverage php vendor/bin/phpunit --configuration=phpunit.xml --coverage-html ./.reports/phpunit/coverage
+	@XDEBUG_MODE=coverage php vendor/bin/phpunit --testsuite unit --configuration=phpunit.xml
+
+phpintergration: ##2 Starts all PHPUnit Tests
+	@XDEBUG_MODE=coverage cd ../../.. && php vendor/bin/phpunit --testsuite integration --configuration=custom/plugins/MolliePayments/phpunit.xml
 
 infection: ##2 Starts all Infection/Mutation tests
-	@XDEBUG_MODE=coverage php vendor/bin/infection --configuration=./.infection.json --log-verbosity=all --debug
+	@XDEBUG_MODE=coverage php vendor/bin/infection --configuration=./.infection.json --log-verbosity=all --debug --test-framework-options="--testsuite=unit --no-coverage"
 
 insights: ##2 Starts the PHPInsights Analyser
 	@php vendor/bin/phpinsights analyse --no-interaction
@@ -151,6 +154,7 @@ pr: ##2 Prepares everything for a Pull Request
 	@make phpmin -B
 	@make stan -B
 	@make phpunit -B
+	@make phpintergration -B
 	@make jest -B
 	@make eslint mode=no-dry-run -B
 	@make stylelint -B
diff --git a/phpunit.xml b/phpunit.xml
index 23ea1e636..30f260190 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,23 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
-         bootstrap="./vendor/autoload.php"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
+         bootstrap="./tests/bootstrap/index.php"
          cacheResult="false"
          colors="true"
          executionOrder="random"
-         resolveDependencies="true"
 >
+    <php>
+        <ini name="error_reporting" value="-1"/>
+        <server name="KERNEL_CLASS" value="Shopware\Core\Kernel"/>
+        <env name="APP_ENV" value="test"/>
+        <env name="APP_DEBUG" value="1"/>
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
+    </php>
 
     <testsuites>
-        <testsuite name="MolliePayments Tests">
+        <testsuite name="unit">
             <directory>./tests/PHPUnit</directory>
+            <directory>./tests/Unit</directory>
+        </testsuite>
+        <testsuite name="integration">
+            <directory>./tests/Integration</directory>
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <coverage processUncoveredFiles="true">
         <include>
-            <directory>./src</directory>
+            <directory suffix=".php">./src</directory>
+            <directory suffix=".php">./shopware</directory>
         </include>
     </coverage>
+
     
 </phpunit>
diff --git a/polyfill/Shopware/Core/Content/Flow/Dispatching/Aware/ScalarValuesAware.php b/polyfill/Shopware/Core/Content/Flow/Dispatching/Aware/ScalarValuesAware.php
new file mode 100644
index 000000000..b6fced9ab
--- /dev/null
+++ b/polyfill/Shopware/Core/Content/Flow/Dispatching/Aware/ScalarValuesAware.php
@@ -0,0 +1,18 @@
+<?php declare(strict_types=1);
+
+namespace Shopware\Core\Content\Flow\Dispatching\Aware;
+
+use Shopware\Core\Framework\Event\IsFlowEventAware;
+use Shopware\Core\Framework\Log\Package;
+
+#[Package('services-settings')]
+#[IsFlowEventAware]
+interface ScalarValuesAware
+{
+    public const STORE_VALUES = 'store_values';
+
+    /**
+     * @return array<string, scalar|array<mixed>|null>
+     */
+    public function getValues(): array;
+}
diff --git a/shopware/Component/Logger/PluginSettingsHandler.php b/shopware/Component/Logger/PluginSettingsHandler.php
new file mode 100644
index 000000000..12e8122f6
--- /dev/null
+++ b/shopware/Component/Logger/PluginSettingsHandler.php
@@ -0,0 +1,83 @@
+<?php
+declare(strict_types=1);
+
+namespace Mollie\Shopware\Component\Logger;
+
+use Doctrine\DBAL\Connection;
+use Mollie\Shopware\Component\Settings\AbstractSettingsService;
+use Monolog\Handler\AbstractHandler;
+use Monolog\Handler\RotatingFileHandler;
+use Monolog\Level;
+use Monolog\LogRecord;
+use Psr\Log\LogLevel;
+
+final class PluginSettingsHandler extends AbstractHandler
+{
+    private const LOG_CHANNEL = 'mollie';
+    private ?AbstractHandler $fileHandler = null;
+    private Connection $connection;
+    private string $filePath;
+    private ?bool $connectedCache = null;
+
+    private AbstractSettingsService $settingsService;
+
+    /**
+     * @param AbstractSettingsService $settingsService
+     * @param Connection $connection
+     * @param string $filePath
+     * @param int|Level|string $level
+     * @param bool $bubble
+     */
+    public function __construct(AbstractSettingsService $settingsService, Connection $connection, string $filePath, bool $bubble = true)
+    {
+        parent::__construct(LogLevel::DEBUG, $bubble);
+        $this->connection = $connection;
+        $this->filePath = $filePath;
+        $this->settingsService = $settingsService;
+    }
+
+    /**
+     * We need to define types here because shopware 6.4 uses old monologger where LogRecord does not exists.
+     * @param array|LogRecord $record
+     * @return bool
+     */
+    public function handle($record): bool
+    {
+        if ($this->isConnected() === false) {
+            return false;
+        }
+
+        $channel = $record['channel'] ?? null;
+        if ($channel !== self::LOG_CHANNEL) {
+            return false;
+        }
+
+
+        if ($this->fileHandler === null) {
+            $this->fileHandler = $this->initializeHandler();
+        }
+
+        $this->fileHandler->handle($record);
+
+        return $this->bubble === false;
+    }
+
+    private function isConnected(): bool
+    {
+        if ($this->connectedCache !== null) {
+            return $this->connectedCache;
+        }
+
+        $this->connectedCache = $this->connection->isConnected();
+        return $this->connectedCache;
+    }
+
+    private function initializeHandler(): AbstractHandler
+    {
+        $loggerSettings = $this->settingsService->getLoggerSettings();
+
+        $logLevel = $loggerSettings->isDebugMode() ? LogLevel::DEBUG : LogLevel::INFO;
+        $maxFiles = $loggerSettings->getLogFileDays();
+        return new RotatingFileHandler($this->filePath, $maxFiles, $logLevel);
+    }
+}
diff --git a/shopware/Component/Logger/RecordAnonymizer.php b/shopware/Component/Logger/RecordAnonymizer.php
new file mode 100644
index 000000000..2f6a0d49f
--- /dev/null
+++ b/shopware/Component/Logger/RecordAnonymizer.php
@@ -0,0 +1,49 @@
+<?php
+declare(strict_types=1);
+
+namespace Mollie\Shopware\Component\Logger;
+
+use Monolog\LogRecord;
+use Monolog\Processor\ProcessorInterface;
+use Symfony\Component\HttpFoundation\IpUtils;
+
+final class RecordAnonymizer implements ProcessorInterface
+{
+    private const URL_SLUG = '/payment/finalize-transaction';
+    /**
+     * @param string $url
+     * @return string
+     */
+    private function anonymize(string $url): string
+    {
+        # we do not want to save the used tokens in our log file
+        # also, those one time tokens are soooooo long. it's just annoying and fills disk space ;)
+        if (strpos($url, self::URL_SLUG) !== false) {
+            $parts = explode(self::URL_SLUG, $url);
+
+            $url = str_replace($parts[1], '', $url);
+        }
+
+        return (string)$url;
+    }
+    /**
+     * We need to define types here because shopware 6.4 uses old monologger where LogRecord does not exists.
+     * @param array|LogRecord $record
+     * @return array|LogRecord
+     */
+    public function __invoke($record)
+    {
+        /** @phpstan-ignore-next-line */
+        if (isset($record['extra'])) {
+            if (array_key_exists('ip', $record['extra'])) {
+                # replace it with our anonymous IP
+                $record['extra']['ip'] = IpUtils::anonymize(trim($record['extra']['ip']));
+            }
+
+            if (array_key_exists('url', $record['extra'])) {
+                $record['extra']['url'] = $this->anonymize($record['extra']['url']);
+            }
+        }
+        return $record;
+    }
+}
diff --git a/shopware/Component/Logger/Resources/config/services.xml b/shopware/Component/Logger/Resources/config/services.xml
new file mode 100644
index 000000000..127b68f72
--- /dev/null
+++ b/shopware/Component/Logger/Resources/config/services.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+
+        <service id="Mollie\Shopware\Component\Logger\RecordAnonymizer">
+            <tag name="monolog.processor"/>
+        </service>
+
+        <service id="Monolog\Processor\WebProcessor">
+            <tag name="monolog.processor" channel="mollie"/>
+        </service>
+
+        <service id="Monolog\Processor\IntrospectionProcessor">
+            <tag name="monolog.processor" channel="mollie"/>
+        </service>
+
+        <service  id="Mollie\Shopware\Component\Logger\PluginSettingsHandler">
+            <argument type="service" id="Mollie\Shopware\Component\Settings\SettingsService"/>
+            <argument type="service"  id="Doctrine\DBAL\Connection"/>
+            <argument>%kernel.logs_dir%/mollie_%kernel.environment%.log</argument>
+        </service>
+    </services>
+</container>
\ No newline at end of file
diff --git a/shopware/Component/Settings/AbstractSettingsService.php b/shopware/Component/Settings/AbstractSettingsService.php
new file mode 100644
index 000000000..fda2aef8e
--- /dev/null
+++ b/shopware/Component/Settings/AbstractSettingsService.php
@@ -0,0 +1,12 @@
+<?php
+declare(strict_types=1);
+
+namespace Mollie\Shopware\Component\Settings;
+
+use Mollie\Shopware\Component\Settings\Struct\LoggerSettings;
+
+abstract class AbstractSettingsService
+{
+    abstract public function getDecorated(): AbstractSettingsService;
+    abstract public function getLoggerSettings(?string $salesChannelId = null): LoggerSettings;
+}
diff --git a/shopware/Component/Settings/Resources/config/services.xml b/shopware/Component/Settings/Resources/config/services.xml
new file mode 100644
index 000000000..dd8994fda
--- /dev/null
+++ b/shopware/Component/Settings/Resources/config/services.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+
+        <service id="Mollie\Shopware\Component\Settings\SettingsService">
+            <argument type="service" id="Shopware\Core\System\SystemConfig\SystemConfigService"/>
+        </service>
+
+
+    </services>
+</container>
\ No newline at end of file
diff --git a/shopware/Component/Settings/SettingsService.php b/shopware/Component/Settings/SettingsService.php
new file mode 100644
index 000000000..f3440a5f7
--- /dev/null
+++ b/shopware/Component/Settings/SettingsService.php
@@ -0,0 +1,60 @@
+<?php
+declare(strict_types=1);
+
+namespace Mollie\Shopware\Component\Settings;
+
+use Mollie\Shopware\Component\Settings\Struct\LoggerSettings;
+use Shopware\Core\Framework\Plugin\Exception\DecorationPatternException;
+use Shopware\Core\System\SystemConfig\SystemConfigService;
+
+final class SettingsService extends AbstractSettingsService
+{
+    public const SYSTEM_CONFIG_DOMAIN = 'MolliePayments.config';
+    private const CACHE_KEY_LOGGER = 'logger';
+    private const CACHE_KEY_SHOPWARE = 'shopware';
+
+    private SystemConfigService $systemConfigService;
+
+    private array $settingsCache = [];
+
+
+
+    public function __construct(SystemConfigService $systemConfigService)
+    {
+        $this->systemConfigService = $systemConfigService;
+    }
+
+    public function getDecorated(): AbstractSettingsService
+    {
+        throw new DecorationPatternException(self::class);
+    }
+
+    public function getLoggerSettings(?string $salesChannelId = null): LoggerSettings
+    {
+        $cacheKey = self::CACHE_KEY_LOGGER . '_' . ($salesChannelId ?? 'all');
+
+        if (isset($this->settingsCache[$cacheKey])) {
+            return $this->settingsCache[$cacheKey];
+        }
+
+
+        $shopwareSettings = $this->getShopwareSettings($salesChannelId);
+        $loggerSettings = LoggerSettings::createFromShopwareArray($shopwareSettings);
+        $this->settingsCache[$cacheKey] = $loggerSettings;
+
+        return $loggerSettings;
+    }
+
+    private function getShopwareSettings(?string $salesChannelId = null): array
+    {
+        $cacheKey = self::CACHE_KEY_SHOPWARE . '_' . ($salesChannelId ?? 'all');
+
+        if (isset($this->settingsCache[$cacheKey])) {
+            return $this->settingsCache[$cacheKey];
+        }
+
+        $shopwareSettingsArray = $this->systemConfigService->get(self::SYSTEM_CONFIG_DOMAIN, $salesChannelId);
+        $this->settingsCache[$cacheKey] = $shopwareSettingsArray;
+        return $shopwareSettingsArray;
+    }
+}
diff --git a/shopware/Component/Settings/Struct/LoggerSettings.php b/shopware/Component/Settings/Struct/LoggerSettings.php
new file mode 100644
index 000000000..c50485879
--- /dev/null
+++ b/shopware/Component/Settings/Struct/LoggerSettings.php
@@ -0,0 +1,43 @@
+<?php
+declare(strict_types=1);
+
+namespace Mollie\Shopware\Component\Settings\Struct;
+
+use Shopware\Core\Framework\Struct\Struct;
+
+final class LoggerSettings extends Struct
+{
+    public const KEY_LOG_FILE_DAYS = 'logFileDays';
+    public const KEY_DEBUG_MODE = 'debugMode';
+    private bool $isDebugMode = false;
+    private int $logFileDays = 0;
+
+
+    /**
+     * @param bool $isDebugMode
+     * @param int $logFileDays
+     */
+    public function __construct(bool $isDebugMode, int $logFileDays)
+    {
+        $this->isDebugMode = $isDebugMode;
+        $this->logFileDays = $logFileDays;
+    }
+
+    public static function createFromShopwareArray(array $settings): LoggerSettings
+    {
+        $logFileDays = $settings[self::KEY_LOG_FILE_DAYS] ?? 0;
+        $debugMode = $settings[self::KEY_DEBUG_MODE] ?? false;
+
+        return new LoggerSettings($debugMode, $logFileDays);
+    }
+
+    public function isDebugMode(): bool
+    {
+        return $this->isDebugMode === true;
+    }
+
+    public function getLogFileDays(): int
+    {
+        return $this->logFileDays;
+    }
+}
diff --git a/shopware/README.md b/shopware/README.md
new file mode 100644
index 000000000..6a48a77e3
--- /dev/null
+++ b/shopware/README.md
@@ -0,0 +1,3 @@
+# New Namespace
+
+This directory will become new source, we want to refactor and move all classes from src into shopware in order to cleanup the namespace
\ No newline at end of file
diff --git a/shopware/Resources/config/services.xml b/shopware/Resources/config/services.xml
new file mode 100644
index 000000000..3eb09e0ee
--- /dev/null
+++ b/shopware/Resources/config/services.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd">
+
+   <imports>
+       <import resource="./../../Component/**/Resources/config/**.xml"/>
+   </imports>
+</container>
\ No newline at end of file
diff --git a/src/Compatibility/Bundles/FlowBuilder/FlowBuilderFactory.php b/src/Compatibility/Bundles/FlowBuilder/FlowBuilderFactory.php
index 334567dd3..6203a9ead 100644
--- a/src/Compatibility/Bundles/FlowBuilder/FlowBuilderFactory.php
+++ b/src/Compatibility/Bundles/FlowBuilder/FlowBuilderFactory.php
@@ -56,7 +56,7 @@ public function createDispatcher(): FlowBuilderDispatcherAdapterInterface
             return new ShopwareFlowBuilderDispatcher65($this->flowDispatcher);
         }
 
-        if ($this->versionCompare->lt(self::FLOW_BUILDER_MIN_VERSION)) {
+        if ($this->versionCompare->gt(self::FLOW_BUILDER_MIN_VERSION)) {
             return new DummyFlowBuilderDispatcher();
         }
 
diff --git a/src/Resources/config/compatibility/flowbuilder/6.4.6.0.xml b/src/Resources/config/compatibility/flowbuilder/6.4.6.0.xml
index 5a87686ef..890710fc2 100644
--- a/src/Resources/config/compatibility/flowbuilder/6.4.6.0.xml
+++ b/src/Resources/config/compatibility/flowbuilder/6.4.6.0.xml
@@ -10,7 +10,7 @@
         <service id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\Actions\ShipOrderAction">
             <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
             <argument type="service" id="Kiener\MolliePayments\Components\ShipmentManager\ShipmentManager"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <tag name="kernel.event_subscriber"/>
             <tag name="flow.action" key="action.mollie.order.ship" priority="900"/>
         </service>
@@ -18,7 +18,7 @@
         <service id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\Actions\RefundOrderAction">
             <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
             <argument type="service" id="Kiener\MolliePayments\Components\RefundManager\RefundManager"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <tag name="kernel.event_subscriber"/>
             <tag name="flow.action" key="action.mollie.order.refund" priority="900"/>
         </service>
diff --git a/src/Resources/config/config.xml b/src/Resources/config/config.xml
index a77198131..a903cb061 100644
--- a/src/Resources/config/config.xml
+++ b/src/Resources/config/config.xml
@@ -44,6 +44,15 @@
             <helpText lang="nl-NL">Staat de test modus toe met de Mollie Sandbox betalingspagina. De Storefront zal ook "(Test Mode)" tonen naast de naam van de betaalmethode.</helpText>
             <helpText lang="it-IT">Abilita la modalità test con la pagina di pagamento di Mollie Sandbox. Lo Storefront mostrerà anche (Modalità test) accanto ai nomi dei metodi di pagamento.</helpText>
         </input-field>
+        <component name="mollie-pluginconfig-section-api">
+            <name>molliePluginConfigSectionApi</name>
+        </component>
+    </card>
+    <card>
+        <title>Logger</title>
+        <title lang="de-DE">Logger</title>
+        <title lang="nl-NL">Logger</title>
+        <title lang="it-IT">Logger</title>
         <input-field type="bool">
             <name>debugMode</name>
             <label>Debug Mode</label>
@@ -68,9 +77,6 @@
             <helpText lang="nl-NL">Stel het aantal dagen in hoe lang logbestanden worden bewaard totdat ze automatisch worden verwijderd.</helpText>
             <helpText lang="it-IT">Imposta il numero di giorni per quanto tempo i file di log devono essere conservati prima di essere automaticamente eliminati.</helpText>
         </input-field>
-        <component name="mollie-pluginconfig-section-api">
-            <name>molliePluginConfigSectionApi</name>
-        </component>
     </card>
     <card>
         <title>Payments</title>
diff --git a/src/Resources/config/packages/monolog.xml b/src/Resources/config/packages/monolog.xml
new file mode 100644
index 000000000..3f3cd7ce1
--- /dev/null
+++ b/src/Resources/config/packages/monolog.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:monolog="http://symfony.com/schema/dic/monolog"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/monolog
+        https://symfony.com/schema/dic/monolog/monolog-1.0.xsd
+">
+    <monolog:config>
+        <monolog:channel>mollie</monolog:channel>
+
+        <monolog:handler
+                name="mollie_rotation_file"
+                channel="mollie"
+                type="service"
+                id="Mollie\Shopware\Component\Logger\PluginSettingsHandler"
+                level="debug"
+        />
+    </monolog:config>
+</container>
\ No newline at end of file
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index 936ac6257..db56f5b28 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -23,6 +23,8 @@
         <import resource="services/controller.xml"/>
         <import resource="services/snippets.xml"/>
         <import resource="services/repositories.xml"/>
+        <import resource="packages/**/*.xml"/>
+        <import resource="../../../shopware/Resources/config/services.xml"/>
     </imports>
 
 
@@ -46,7 +48,7 @@
 
         <!-- Helpers -->
         <service id="Kiener\MolliePayments\Service\Order\OrderStateService" class="Kiener\MolliePayments\Service\Order\OrderStateService">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Transition\OrderTransitionService"/>
         </service>
 
@@ -54,7 +56,7 @@
             <argument type="service" id="Kiener\MolliePayments\Service\Order\OrderStatusUpdater"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Order\OrderTimeService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
 
@@ -72,7 +74,7 @@
             <argument type="service" id="customer_address.repository"/>
             <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\Customer"/>
             <argument type="service" id="event_dispatcher"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="Shopware\Core\System\SalesChannel\Context\SalesChannelContextPersister"/>
             <argument type="service" id="salutation.repository"/>
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
@@ -117,7 +119,7 @@
         </service>
 
 
-        <service id="Kiener\MolliePayments\Service\SettingsService" class="Kiener\MolliePayments\Service\SettingsService">
+        <service id="Kiener\MolliePayments\Service\SettingsService">
             <argument type="service" id="Shopware\Core\System\SystemConfig\SystemConfigService"/>
             <argument type="service" id="sales_channel.repository"/>
             <argument type="service" id="Kiener\MolliePayments\Service\PayPalExpressConfig"/>
@@ -158,7 +160,7 @@
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
             <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
 
@@ -199,7 +201,7 @@
 
         <service id="Kiener\MolliePayments\Service\TrackingInfoStructFactory">
             <argument type="service" id="Kiener\MolliePayments\Service\UrlParsingService"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
 
diff --git a/src/Resources/config/services/api.xml b/src/Resources/config/services/api.xml
index 70d93c2b7..65d3a603f 100644
--- a/src/Resources/config/services/api.xml
+++ b/src/Resources/config/services/api.xml
@@ -12,7 +12,7 @@
         <service id="Kiener\MolliePayments\Factory\MollieApiFactory" class="Kiener\MolliePayments\Factory\MollieApiFactory">
             <argument>%kernel.shopware_version%</argument>
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Service\MollieApi\Customer">
@@ -24,7 +24,7 @@
             <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\Payment"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Router\RoutingBuilder"/>
             <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\RequestAnonymizer\MollieRequestAnonymizer"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\CustomerService"/>
         </service>
diff --git a/src/Resources/config/services/builder.xml b/src/Resources/config/services/builder.xml
index ff974da4d..fc8aface6 100644
--- a/src/Resources/config/services/builder.xml
+++ b/src/Resources/config/services/builder.xml
@@ -16,7 +16,7 @@
             <argument type="service" id="Kiener\MolliePayments\Service\Router\RoutingBuilder"/>
             <argument type="service" id="Kiener\MolliePayments\Service\MollieLocaleService"/>
             <argument type="service" id="event_dispatcher"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Service\MollieApi\Builder\MollieShippingLineItemBuilder">
diff --git a/src/Resources/config/services/commands.xml b/src/Resources/config/services/commands.xml
index 80dcc3aed..5ea7ff5a1 100644
--- a/src/Resources/config/services/commands.xml
+++ b/src/Resources/config/services/commands.xml
@@ -8,26 +8,26 @@
 
         <service id="Kiener\MolliePayments\Command\Install\SetupCommand">
             <argument type="service" id="Kiener\MolliePayments\Components\Installer\PluginInstaller"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <tag name="console.command"/>
         </service>
 
         <service id="Kiener\MolliePayments\Command\DAL\DALCleanupCommand">
             <argument type="service" id="product.repository"/>
             <argument type="service" id="Doctrine\DBAL\Connection"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <tag name="console.command"/>
         </service>
 
         <service id="Kiener\MolliePayments\Command\ApplePay\ApplePayDownloadCommand">
             <argument type="service" id="Kiener\MolliePayments\Components\ApplePayDirect\ApplePayDirect"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <tag name="console.command"/>
         </service>
 
         <service id="Kiener\MolliePayments\Command\Subscriptions\RenewalReminderCommand">
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <tag name="console.command"/>
         </service>
 
diff --git a/src/Resources/config/services/components.xml b/src/Resources/config/services/components.xml
index 6da8cc788..c998e5806 100644
--- a/src/Resources/config/services/components.xml
+++ b/src/Resources/config/services/components.xml
@@ -16,7 +16,7 @@
             <argument type="service" id="Kiener\MolliePayments\Service\Stock\StockManager"/>
             <argument type="service" id="mollie_refund.repository"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Refund\RefundCreditNoteService"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Components\RefundManager\Builder\RefundDataBuilder">
@@ -29,7 +29,7 @@
             <argument type="service" id="Kiener\MolliePayments\Components\RefundManager\RefundManager"/>
             <argument type="service" id="order_return.repository" on-invalid="null"/>
             <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
 
@@ -90,7 +90,7 @@
             <argument type="service" id="order_line_item.repository"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Stock\StockManager"/>
             <argument type="service" id="event_dispatcher"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Components\ApplePayDirect\Services\ApplePayShippingAddressFaker">
diff --git a/src/Resources/config/services/controller.xml b/src/Resources/config/services/controller.xml
index 0070aee3b..3066c1195 100644
--- a/src/Resources/config/services/controller.xml
+++ b/src/Resources/config/services/controller.xml
@@ -50,7 +50,7 @@
 
         <service id="Kiener\MolliePayments\Controller\Api\PaymentMethod\PaymentMethodControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Service\PaymentMethodService"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
 
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
@@ -71,7 +71,7 @@
             <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
             <argument type="service" id="Kiener\MolliePayments\Components\RefundManager\RefundManager"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Refund\RefundService"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
 
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
@@ -82,7 +82,7 @@
         <service id="Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Components\ShipmentManager\ShipmentManager"/>
             <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
 
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
@@ -92,7 +92,7 @@
 
         <service id="Kiener\MolliePayments\Controller\Api\Support\SupportControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Facade\MollieSupportFacade"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
 
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
@@ -113,7 +113,7 @@
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
             <argument type="service" id="Kiener\MolliePayments\Repository\OrderRepository"/>
             <argument type="service" id="Kiener\MolliePayments\Repository\OrderTransactionRepository"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
@@ -155,7 +155,7 @@
             <argument type="service" id="Kiener\MolliePayments\Factory\MollieApiFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Order\OrderStateService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\TransactionService"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Transition\TransactionTransitionService"/>
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\Order"/>
@@ -173,7 +173,7 @@
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
             <argument type="service" id="Kiener\MolliePayments\Repository\OrderRepository"/>
             <argument type="service" id="Kiener\MolliePayments\Repository\OrderTransactionRepository"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
@@ -183,7 +183,7 @@
         <service id="Kiener\MolliePayments\Controller\Storefront\CreditCard\CreditCardControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Service\CustomerService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\MandateService"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
@@ -207,7 +207,7 @@
         <service id="Kiener\MolliePayments\Controller\Storefront\ApplePayDirect\ApplePayDirectControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Components\ApplePayDirect\ApplePayDirect"/>
             <argument type="service" id="router"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderFactory"/>
             <argument type="service"
                       id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderEventFactory"/>
@@ -224,7 +224,7 @@
             <argument type="service"
                       id="Kiener\MolliePayments\Components\Subscription\Page\Account\SubscriptionPageLoader"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
@@ -236,7 +236,7 @@
             <argument type="service" id="Kiener\MolliePayments\Components\PaypalExpress\Route\FinishCheckoutRoute"/>
             <argument type="service" id="Kiener\MolliePayments\Components\PaypalExpress\Route\CancelCheckoutRoute"/>
             <argument type="service" id="router"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
@@ -251,13 +251,13 @@
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\ConfigService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\MollieLocaleService"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <tag name="controller.service_arguments"/>
         </service>
 
         <service id="Kiener\MolliePayments\Controller\StoreApi\ApplePayDirect\ApplePayDirectControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Components\ApplePayDirect\ApplePayDirect"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <tag name="controller.service_arguments"/>
         </service>
 
@@ -271,7 +271,7 @@
         <service id="Kiener\MolliePayments\Controller\StoreApi\Subscription\SubscriptionControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\DAL\Repository\SubscriptionRepository"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <tag name="controller.service_arguments"/>
         </service>
 
diff --git a/src/Resources/config/services/facades.xml b/src/Resources/config/services/facades.xml
index 90a0ae218..f081d5077 100644
--- a/src/Resources/config/services/facades.xml
+++ b/src/Resources/config/services/facades.xml
@@ -14,7 +14,7 @@
             <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\OrderDeliveryExtractor"/>
             <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\OrderItemsExtractor"/>
             <argument type="service" id="Kiener\MolliePayments\Service\TrackingInfoStructFactory"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Facade\MolliePaymentDoPay" public="true">
@@ -28,7 +28,7 @@
             <argument type="service" id="Kiener\MolliePayments\Service\Order\UpdateOrderLineItems"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
             <argument type="service" id="twig"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Facade\MolliePaymentFinalize" public="true">
@@ -51,7 +51,7 @@
             <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\Order"/>
             <argument type="service" id="Kiener\MolliePayments\Facade\MollieOrderPaymentFlow"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Router\RoutingDetector"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Facade\MollieOrderPaymentFlow">
diff --git a/src/Resources/config/services/fixtures/fixtures.xml b/src/Resources/config/services/fixtures/fixtures.xml
index f06bebcf6..74eafaac1 100644
--- a/src/Resources/config/services/fixtures/fixtures.xml
+++ b/src/Resources/config/services/fixtures/fixtures.xml
@@ -8,7 +8,7 @@
 
         <service id="MolliePayments\Fixtures\SalesChannel\SalesChannelFixture">
             <argument type="service" id="sales_channel.repository"/>
-            <argument type="service" id="Kiener\MolliePayments\Repository\PaymentMethodRepository"/>
+            <argument type="service" id="payment_method.repository"/>
             <tag name="basecom.fixture"/>
         </service>
 
diff --git a/src/Resources/config/services/handlers.xml b/src/Resources/config/services/handlers.xml
index d9a8d8eda..994b8f90a 100644
--- a/src/Resources/config/services/handlers.xml
+++ b/src/Resources/config/services/handlers.xml
@@ -8,28 +8,28 @@
 
         <!-- Default PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\PaymentHandler" class="Kiener\MolliePayments\Handler\PaymentHandler">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Apple Pay PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\ApplePayPayment" class="Kiener\MolliePayments\Handler\Method\ApplePayPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- BanContact PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\BanContactPayment" class="Kiener\MolliePayments\Handler\Method\BanContactPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Bank Transfer PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\BankTransferPayment" class="Kiener\MolliePayments\Handler\Method\BankTransferPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
             <tag name="shopware.payment.method.async"/>
@@ -37,21 +37,21 @@
 
         <!-- Belfius PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\BelfiusPayment" class="Kiener\MolliePayments\Handler\Method\BelfiusPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Billie PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\BilliePayment" class="Kiener\MolliePayments\Handler\Method\BilliePayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Credit Card PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\CreditCardPayment" class="Kiener\MolliePayments\Handler\Method\CreditCardPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <argument type="service" id="Kiener\MolliePayments\Service\CustomerService"/>
             <tag name="shopware.payment.method.async"/>
@@ -59,21 +59,21 @@
 
         <!-- Direct Debit PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\DirectDebitPayment" class="Kiener\MolliePayments\Handler\Method\DirectDebitPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Eps PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\EpsPayment" class="Kiener\MolliePayments\Handler\Method\EpsPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Gift Card PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\GiftCardPayment" class="Kiener\MolliePayments\Handler\Method\GiftCardPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
@@ -81,133 +81,133 @@
 
         <!-- iDeal PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\iDealPayment" class="Kiener\MolliePayments\Handler\Method\iDealPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- ING HomePay PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\IngHomePayPayment" class="Kiener\MolliePayments\Handler\Method\IngHomePayPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- KBC PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\KbcPayment" class="Kiener\MolliePayments\Handler\Method\KbcPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Klarna Pay Later PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\KlarnaPayLaterPayment" class="Kiener\MolliePayments\Handler\Method\KlarnaPayLaterPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Klarna Pay Now PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\KlarnaPayNowPayment" class="Kiener\MolliePayments\Handler\Method\KlarnaPayNowPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Klarna Slice It PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\KlarnaSliceItPayment" class="Kiener\MolliePayments\Handler\Method\KlarnaSliceItPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- PayPal PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\PayPalPayment" class="Kiener\MolliePayments\Handler\Method\PayPalPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- PayPal Express PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\PayPalExpressPayment" class="Kiener\MolliePayments\Handler\Method\PayPalExpressPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- PaySafeCard PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\PaySafeCardPayment" class="Kiener\MolliePayments\Handler\Method\PaySafeCardPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Przelewy24 PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\Przelewy24Payment" class="Kiener\MolliePayments\Handler\Method\Przelewy24Payment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- TWINT PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\TwintPayment" class="Kiener\MolliePayments\Handler\Method\TwintPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Sofort PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\SofortPayment" class="Kiener\MolliePayments\Handler\Method\SofortPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Voucher PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\VoucherPayment" class="Kiener\MolliePayments\Handler\Method\VoucherPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- in3 PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\In3Payment" class="Kiener\MolliePayments\Handler\Method\In3Payment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- POS Terminal PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\PosPayment" class="Kiener\MolliePayments\Handler\Method\PosPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Blick PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\BlikPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Bancomat PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\BancomatPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- KlanraOne PaymentHandler-->
         <service id="Kiener\MolliePayments\Handler\Method\KlarnaOnePayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Palma PaymentHandler-->
         <service id="Kiener\MolliePayments\Handler\Method\AlmaPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
@@ -215,42 +215,42 @@
 
         <!-- MyBank PaymentHandler-->
         <service id="Kiener\MolliePayments\Handler\Method\MyBankPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Trustly PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\TrustlyPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Payconiq PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\PayconiqPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Riverty PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\RivertyPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Satispay PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\SatispayPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
 
         <!-- Pay by Bank PaymentHandler -->
         <service id="Kiener\MolliePayments\Handler\Method\PayByBankPayment">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="service_container"/>
             <tag name="shopware.payment.method.async"/>
         </service>
diff --git a/src/Resources/config/services/payment.xml b/src/Resources/config/services/payment.xml
index 24c841615..a739ce679 100644
--- a/src/Resources/config/services/payment.xml
+++ b/src/Resources/config/services/payment.xml
@@ -12,7 +12,7 @@
             <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\OrderItemsExtractor"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
 
             <tag name="mollie_payments.payment_method.remover.sw64"/>
         </service>
@@ -25,7 +25,7 @@
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Payment\Provider\ActivePaymentMethodsProvider"/>
             <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\OrderItemsExtractor"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
 
             <tag name="mollie_payments.payment_method.remover.sw64"/>
         </service>
@@ -37,7 +37,7 @@
             <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\OrderItemsExtractor"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
 
             <tag name="mollie_payments.payment_method.remover.sw64"/>
             <tag name="mollie_payments.payment_method.remover.sw63"/>
@@ -50,7 +50,7 @@
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Voucher\VoucherService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\OrderItemsExtractor"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
 
             <tag name="mollie_payments.payment_method.remover.sw64"/>
             <tag name="mollie_payments.payment_method.remover.sw63"/>
@@ -62,7 +62,7 @@
             <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\OrderItemsExtractor"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
 
             <tag name="mollie_payments.payment_method.remover.sw64"/>
         </service>
diff --git a/src/Resources/config/services/scheduled_tasks.xml b/src/Resources/config/services/scheduled_tasks.xml
index 6d21e4e74..929cea5fb 100755
--- a/src/Resources/config/services/scheduled_tasks.xml
+++ b/src/Resources/config/services/scheduled_tasks.xml
@@ -18,14 +18,14 @@
         <service id="Kiener\MolliePayments\ScheduledTask\Subscription\RenewalReminder\RenewalReminderTaskHandler">
             <argument type="service" id="scheduled_task.repository"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <tag name="messenger.message_handler"/>
         </service>
 
         <service id="Kiener\MolliePayments\ScheduledTask\Subscription\RenewalReminder\RenewalReminderTaskDevHandler">
             <argument type="service" id="scheduled_task.repository"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <tag name="messenger.message_handler"/>
         </service>
 
@@ -36,7 +36,7 @@
         <service id="Kiener\MolliePayments\ScheduledTask\OrderStatus\ExpireOrderTaskHandler">
             <argument type="service" id="scheduled_task.repository"/>
             <argument type="service" id="Kiener\MolliePayments\Components\OrderExpiration\ExpireAction"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <tag name="messenger.message_handler"/>
         </service>
 
diff --git a/src/Resources/config/services/services.xml b/src/Resources/config/services/services.xml
index 5d7bec58b..fa0536616 100644
--- a/src/Resources/config/services/services.xml
+++ b/src/Resources/config/services/services.xml
@@ -6,15 +6,6 @@
 
     <services>
 
-        <service id="Kiener\MolliePayments\Service\Logger\MollieLoggerFactory" class="Kiener\MolliePayments\Service\Logger\MollieLoggerFactory">
-            <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
-            <argument>%kernel.logs_dir%/mollie_%kernel.environment%.log</argument>
-            <argument type="service" id="Doctrine\DBAL\Connection"/>
-        </service>
-
-        <service id="mollie_payments.logger" class="Monolog\Logger">
-            <factory service="Kiener\MolliePayments\Service\Logger\MollieLoggerFactory" method="createLogger"/>
-        </service>
 
         <service id="Kiener\MolliePayments\Service\OrderDeliveryService">
             <argument type="service" id="order_delivery.repository"/>
@@ -39,17 +30,17 @@
 
         <service id="Kiener\MolliePayments\Service\Transition\DeliveryTransitionService">
             <argument type="service" id="Kiener\MolliePayments\Service\Transition\TransitionService"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Service\Transition\TransactionTransitionService" public="true">
             <argument type="service" id="Kiener\MolliePayments\Service\Transition\TransitionService"/>
             <argument type="service" id="Kiener\MolliePayments\Compatibility\CompatibilityFactory"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Service\Order\OrderStateService" class="Kiener\MolliePayments\Service\Order\OrderStateService">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Transition\OrderTransitionService"/>
         </service>
 
@@ -60,7 +51,7 @@
             <argument type="service" id="Kiener\MolliePayments\Service\UpdateOrderCustomFields"/>
             <argument type="service" id="Kiener\MolliePayments\Service\UpdateOrderTransactionCustomFields"/>
             <argument type="service" id="Kiener\MolliePayments\Service\OrderDeliveryService"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
 
@@ -70,7 +61,7 @@
             <argument type="service" id="order.repository"/>
             <argument type="service" id="order_line_item.repository"/>
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
 
@@ -95,12 +86,12 @@
 
 
         <service id="Kiener\MolliePayments\Service\MollieApi\OrderDataExtractor">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="Kiener\MolliePayments\Service\CustomerService"/>
         </service>
 
         <service id="Kiener\MolliePayments\Service\MollieApi\OrderDeliveryExtractor">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Service\MollieApi\OrderItemsExtractor">
@@ -129,7 +120,7 @@
         </service>
 
         <service id="Kiener\MolliePayments\Service\Order\OrderTimeService">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Service\Order\OrderStatusUpdater">
@@ -137,7 +128,7 @@
             <argument type="service" id="order.repository"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Transition\TransactionTransitionService"/>
             <argument type="service" id="state_machine_state.repository"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Service\CartService" class="Kiener\MolliePayments\Service\CartService" public="true">
@@ -150,7 +141,7 @@
 
         <service id="Kiener\MolliePayments\Service\Voucher\VoucherService" class="Kiener\MolliePayments\Service\Cart\Voucher\VoucherService">
             <argument type="service" id="product.repository"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Service\Cart\Subscription\SubscriptionCartCollector">
@@ -173,7 +164,7 @@
         <service id="Kiener\MolliePayments\Service\Payment\Provider\ActivePaymentMethodsProvider">
             <argument type="service" id="Kiener\MolliePayments\Factory\MollieApiFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\Builder\MollieOrderPriceBuilder"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Service\SalesChannel\SalesChannelDataExtractor">
@@ -227,7 +218,7 @@
             <argument type="service" id="sales_channel.repository"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Order\OrderExpireService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
 
diff --git a/src/Resources/config/services/subscriber.xml b/src/Resources/config/services/subscriber.xml
index 394d89a29..269ffb04c 100644
--- a/src/Resources/config/services/subscriber.xml
+++ b/src/Resources/config/services/subscriber.xml
@@ -11,7 +11,7 @@
             <argument type="service" id="Kiener\MolliePayments\Components\ShipmentManager\ShipmentManager"/>
             <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
             <argument type="service" id="order_transaction.repository"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <tag name="kernel.event_subscriber"/>
         </service>
 
@@ -19,14 +19,14 @@
             <argument type="service" id="Kiener\MolliePayments\Factory\MollieApiFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <tag name="kernel.event_subscriber"/>
         </service>
 
 
         <service id="Kiener\MolliePayments\Subscriber\SystemConfigSubscriber">
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <tag name="kernel.event_subscriber"/>
         </service>
 
@@ -68,7 +68,7 @@
         <service id="Kiener\MolliePayments\Subscriber\WebhookTimezoneSubscriber">
             <argument type="service" id="Kiener\MolliePayments\Service\TransactionService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Router\RoutingDetector"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <tag name="kernel.event_subscriber"/>
         </service>
 
@@ -92,7 +92,7 @@
         </service>
 
         <service id="Kiener\MolliePayments\Subscriber\OrderLinesUpdatedSubscriber">
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <tag name="kernel.event_subscriber"/>
         </service>
 
diff --git a/src/Resources/config/services/subscription/services.xml b/src/Resources/config/services/subscription/services.xml
index b7c8b6bd9..c6a6fccfd 100755
--- a/src/Resources/config/services/subscription/services.xml
+++ b/src/Resources/config/services/subscription/services.xml
@@ -47,7 +47,7 @@
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
             <argument type="service" id="Kiener\MolliePayments\Gateway\Mollie\MollieGateway"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\DAL\Repository\SubscriptionRepository"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <tag name="kernel.event_subscriber"/>
         </service>
 
@@ -113,7 +113,7 @@
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderEventFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\Services\SubscriptionHistory\SubscriptionHistoryHandler"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Tags\OrderTagService"/>
         </service>
 
@@ -128,7 +128,7 @@
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderEventFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\Services\SubscriptionHistory\SubscriptionHistoryHandler"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Components\Subscription\Actions\UpdateAddressAction">
@@ -142,7 +142,7 @@
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderEventFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\Services\SubscriptionHistory\SubscriptionHistoryHandler"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
         </service>
 
@@ -157,7 +157,7 @@
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderEventFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\Services\SubscriptionHistory\SubscriptionHistoryHandler"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\Builder\MollieOrderPriceBuilder"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Router\RoutingBuilder"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Mollie\OrderStatusConverter"/>
@@ -174,7 +174,7 @@
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderEventFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\Services\SubscriptionHistory\SubscriptionHistoryHandler"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\Services\SubscriptionRenewing\SubscriptionRenewing"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Mollie\OrderStatusConverter"/>
         </service>
@@ -190,7 +190,7 @@
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderEventFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\Services\SubscriptionHistory\SubscriptionHistoryHandler"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Components\Subscription\Actions\ResumeAction">
@@ -204,7 +204,7 @@
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderEventFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\Services\SubscriptionHistory\SubscriptionHistoryHandler"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Components\Subscription\Actions\SkipAction">
@@ -218,7 +218,7 @@
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderEventFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\Services\SubscriptionHistory\SubscriptionHistoryHandler"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Components\Subscription\Actions\CancelAction">
@@ -232,7 +232,7 @@
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderEventFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\Services\SubscriptionHistory\SubscriptionHistoryHandler"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
         </service>
 
         <service id="Kiener\MolliePayments\Components\Subscription\Actions\RemindAction">
@@ -246,7 +246,7 @@
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderEventFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\Services\SubscriptionHistory\SubscriptionHistoryHandler"/>
-            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="monolog.logger.mollie"/>
             <argument type="service" id="sales_channel.repository"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\Services\SubscriptionReminder\ReminderValidator"/>
         </service>
diff --git a/src/Service/Logger/MollieLoggerFactory.php b/src/Service/Logger/MollieLoggerFactory.php
deleted file mode 100644
index f3d7db7c9..000000000
--- a/src/Service/Logger/MollieLoggerFactory.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Service\Logger;
-
-use Doctrine\DBAL\Connection;
-use Kiener\MolliePayments\Service\Logger\Processors\AnonymousWebProcessor;
-use Kiener\MolliePayments\Service\Logger\Services\URLAnonymizer;
-use Kiener\MolliePayments\Service\SettingsService;
-use Monolog\Handler\RotatingFileHandler;
-use Monolog\Logger;
-use Monolog\Processor\IntrospectionProcessor;
-use Monolog\Processor\WebProcessor;
-use Psr\Log\LoggerInterface;
-
-class MollieLoggerFactory
-{
-    /**
-     * this is the channel name that will be
-     * displayed in the backend. It must not contain spaces
-     */
-    const CHANNEL = 'Mollie';
-
-
-    /**
-     * @var SettingsService
-     */
-    private $settingsService;
-
-    /**
-     * @var string
-     */
-    private $filename;
-
-    /**
-     * @var Connection
-     */
-    private $connection;
-
-
-    /**
-     * @param SettingsService $settingsService
-     * @param string $filename
-     * @param Connection $connection
-     */
-    public function __construct(SettingsService $settingsService, string $filename, Connection $connection)
-    {
-        $this->settingsService = $settingsService;
-        $this->filename = $filename;
-        $this->connection = $connection;
-    }
-
-    /**
-     * @return LoggerInterface
-     */
-    public function createLogger(): LoggerInterface
-    {
-        if (!$this->connection->isConnected()) {
-            // deployment server without database
-            return new Logger(self::CHANNEL);
-        }
-
-        $config = $this->settingsService->getSettings();
-
-        # 100 = DEBUG, 200 = INFO
-        $minLevel = ($config->isDebugMode()) ? 100 : 200;
-        $retentionDays = $config->getLogFileDays();
-
-        $fileHandler = new RotatingFileHandler($this->filename, $retentionDays, $minLevel);
-
-        $processors = [];
-        $processors[] = new AnonymousWebProcessor(new WebProcessor(), new URLAnonymizer());
-        $processors[] = new IntrospectionProcessor();
-
-        /** @var callable $processor */
-        foreach ($processors as $processor) {
-            $fileHandler->pushProcessor($processor);
-        }
-
-        return new Logger(self::CHANNEL, [$fileHandler]);
-    }
-}
diff --git a/src/Service/Logger/Processors/AnonymousWebProcessor.php b/src/Service/Logger/Processors/AnonymousWebProcessor.php
deleted file mode 100644
index 8a8d8557a..000000000
--- a/src/Service/Logger/Processors/AnonymousWebProcessor.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Service\Logger\Processors;
-
-use Kiener\MolliePayments\Service\Logger\Services\URLAnonymizerInterface;
-use Monolog\Processor\ProcessorInterface;
-use Symfony\Component\HttpFoundation\IpUtils;
-
-/**
- * @phpstan-import-type Record from \Monolog\Logger
- */
-class AnonymousWebProcessor
-{
-
-    /**
-     * @var ProcessorInterface
-     */
-    private $webProcessor;
-
-    /**
-     * @var URLAnonymizerInterface
-     */
-    private $urlAnonymizer;
-
-
-    /**
-     * @param ProcessorInterface $webProcessor
-     * @param URLAnonymizerInterface $urlAnonymizer
-     */
-    public function __construct(ProcessorInterface $webProcessor, URLAnonymizerInterface $urlAnonymizer)
-    {
-        $this->webProcessor = $webProcessor;
-        $this->urlAnonymizer = $urlAnonymizer;
-    }
-
-    /**
-     * attention, if we just skip the data type (array/LogRecord) then it
-     * works for both monolog versions (old and new) for Shopware 6.4 and 6.5.
-     *
-     * @phpstan-param  Record $record
-     * @param mixed $record
-     * @return array<mixed>
-     */
-    public function __invoke($record)
-    {
-        $record = $this->webProcessor->__invoke($record);
-
-        /** @phpstan-ignore-next-line */
-        if (isset($record['extra'])) {
-            if (array_key_exists('ip', $record['extra'])) {
-                # replace it with our anonymous IP
-                $record['extra']['ip'] = IpUtils::anonymize(trim($record['extra']['ip']));
-            }
-
-            if (array_key_exists('url', $record['extra'])) {
-                $record['extra']['url'] = $this->urlAnonymizer->anonymize($record['extra']['url']);
-            }
-        }
-
-        return $record;
-    }
-}
diff --git a/src/Service/Logger/Services/URLAnonymizer.php b/src/Service/Logger/Services/URLAnonymizer.php
deleted file mode 100644
index 7db2624d3..000000000
--- a/src/Service/Logger/Services/URLAnonymizer.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Service\Logger\Services;
-
-class URLAnonymizer implements URLAnonymizerInterface
-{
-    /**
-     * @param string $url
-     * @return string
-     */
-    public function anonymize($url)
-    {
-        # we do not want to save the used tokens in our log file
-        # also, those one time tokens are soooooo long. it's just annoying and fills disk space ;)
-        if (strpos($url, '/payment/finalize-transaction') !== false) {
-            $parts = explode('/payment/finalize-transaction', $url);
-
-            $url = str_replace($parts[1], '', $url);
-        }
-
-        return (string)$url;
-    }
-}
diff --git a/src/Service/Logger/Services/URLAnonymizerInterface.php b/src/Service/Logger/Services/URLAnonymizerInterface.php
deleted file mode 100644
index dfd65a917..000000000
--- a/src/Service/Logger/Services/URLAnonymizerInterface.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Service\Logger\Services;
-
-interface URLAnonymizerInterface
-{
-    /**
-     * @param string $url
-     * @return string
-     */
-    public function anonymize($url);
-}
diff --git a/tests/Integration/Settings/LoggerSettingsTest.php b/tests/Integration/Settings/LoggerSettingsTest.php
new file mode 100644
index 000000000..8c96e24e1
--- /dev/null
+++ b/tests/Integration/Settings/LoggerSettingsTest.php
@@ -0,0 +1,53 @@
+<?php
+declare(strict_types=1);
+
+namespace Mollie\Integration\Settings;
+
+use Mollie\Shopware\Component\Settings\SettingsService;
+use Mollie\Shopware\Component\Settings\Struct\LoggerSettings;
+use PHPUnit\Framework\TestCase;
+use Shopware\Core\Framework\Test\TestCaseBase\IntegrationTestBehaviour;
+use Shopware\Core\Framework\Uuid\Uuid;
+use Shopware\Core\System\SystemConfig\SystemConfigService;
+
+/**
+ * @infection-ignore-all
+ */
+final class LoggerSettingsTest extends TestCase
+{
+    use IntegrationTestBehaviour;
+
+    public function testSettingsCanBeReadFromDatabase(): void
+    {
+        /**
+         * @var SystemConfigService $systemConfigService
+         */
+        $systemConfigService = $this->getContainer()->get(SystemConfigService::class);
+        $systemConfigService->set(SettingsService::SYSTEM_CONFIG_DOMAIN . '.' . LoggerSettings::KEY_LOG_FILE_DAYS, 10);
+        $systemConfigService->set(SettingsService::SYSTEM_CONFIG_DOMAIN . '.' . LoggerSettings::KEY_DEBUG_MODE, false);
+
+        $settingsService = new SettingsService($systemConfigService);
+
+        $actualSettings = $settingsService->getLoggerSettings();
+
+        $this->assertSame(10, $actualSettings->getLogFileDays());
+        $this->assertFalse($actualSettings->isDebugMode());
+    }
+
+    public function testSettingsAreCachedPerSalesChannel():void
+    {
+
+        /**
+         * @var SystemConfigService $systemConfigService
+         */
+        $systemConfigService = $this->getContainer()->get(SystemConfigService::class);
+        $settingsService = new SettingsService($systemConfigService);
+
+        $expectedSettings = $settingsService->getLoggerSettings();
+        $actualSettings = $settingsService->getLoggerSettings();
+        $differentSalesChannelSettings = $settingsService->getLoggerSettings(Uuid::randomHex());
+
+        $this->assertSame($expectedSettings,$actualSettings);
+        $this->assertNotSame($actualSettings,$differentSalesChannelSettings);
+    }
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Components/ApplePayDirect/Services/ApplePayDirectDomainSanitizerTest.php b/tests/PHPUnit/Components/ApplePayDirect/Services/ApplePayDirectDomainSanitizerTest.php
index 3a0c5f8f1..689bb09ce 100644
--- a/tests/PHPUnit/Components/ApplePayDirect/Services/ApplePayDirectDomainSanitizerTest.php
+++ b/tests/PHPUnit/Components/ApplePayDirect/Services/ApplePayDirectDomainSanitizerTest.php
@@ -8,6 +8,7 @@
 
 class ApplePayDirectDomainSanitizerTest extends TestCase
 {
+    private ApplePayDirectDomainSanitizer $sanitizer;
     protected function setUp(): void
     {
         $this->sanitizer = new ApplePayDirectDomainSanitizer();
diff --git a/tests/PHPUnit/Service/ApplePayDirect/Models/ApplePayLneItemTest.php b/tests/PHPUnit/Service/ApplePayDirect/Models/ApplePayLineItemTest.php
similarity index 94%
rename from tests/PHPUnit/Service/ApplePayDirect/Models/ApplePayLneItemTest.php
rename to tests/PHPUnit/Service/ApplePayDirect/Models/ApplePayLineItemTest.php
index 1cb07d17c..8c434e567 100644
--- a/tests/PHPUnit/Service/ApplePayDirect/Models/ApplePayLneItemTest.php
+++ b/tests/PHPUnit/Service/ApplePayDirect/Models/ApplePayLineItemTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kiener\MolliePayments\Tests\Service\ApplePayDirect\Models;
+namespace MolliePayments\Tests\Service\ApplePayDirect\Models;
 
 use Kiener\MolliePayments\Components\ApplePayDirect\Models\ApplePayLineItem;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/PHPUnit/Service/Cart/Subscription/SubscriptionCartCollectorTest.php b/tests/PHPUnit/Service/Cart/Subscription/SubscriptionCartCollectorTest.php
index 24c7b6fb3..52e103556 100644
--- a/tests/PHPUnit/Service/Cart/Subscription/SubscriptionCartCollectorTest.php
+++ b/tests/PHPUnit/Service/Cart/Subscription/SubscriptionCartCollectorTest.php
@@ -22,6 +22,11 @@ class SubscriptionCartCollectorTest extends TestCase
     private $collector;
     private $data;
 
+    private $context;
+    private $original;
+    private $behavior;
+
+
     protected function setUp(): void
     {
         $this->dispatcher = $this->createMock(EventDispatcherInterface::class);
diff --git a/tests/PHPUnit/Service/Logger/Processors/AnonymousWebProcessorTest.php b/tests/PHPUnit/Service/Logger/Processors/AnonymousWebProcessorTest.php
deleted file mode 100644
index fb1360ca7..000000000
--- a/tests/PHPUnit/Service/Logger/Processors/AnonymousWebProcessorTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace MolliePayments\Tests\Service\Logger\Processors;
-
-use Kiener\MolliePayments\Service\Logger\Processors\AnonymousWebProcessor;
-use Kiener\MolliePayments\Service\Logger\Services\URLAnonymizer;
-use Kiener\MolliePayments\Service\Logger\Services\URLAnonymizerInterface;
-use Monolog\Processor\ProcessorInterface;
-use PHPUnit\Framework\TestCase;
-
-class AnonymousWebProcessorTest extends TestCase
-{
-    /**
-     * @var AnonymousWebProcessor
-     */
-    private $subject;
-
-    /**
-     * @var ProcessorInterface
-     */
-    private $webProcessor;
-
-    /**
-     * @var URLAnonymizer
-     */
-    private $urlAnonymizer;
-
-    public function setUp(): void
-    {
-        $this->webProcessor = $this->createMock(ProcessorInterface::class);
-        $this->urlAnonymizer = $this->createMock(URLAnonymizerInterface::class);
-
-        $this->subject = new AnonymousWebProcessor(
-            $this->webProcessor,
-            $this->urlAnonymizer
-        );
-    }
-
-    public function testInvokeCanReturnArrayWithIpV4(): void
-    {
-        $url = 'http://someurl';
-        $some_array = [
-            'extra' => [
-                'ip' => '127.0.0.1',
-                'url' => $url
-            ]
-        ];
-
-        $this->webProcessor->expects($this->once())->method('__invoke')
-            ->with([])
-            ->willReturn($some_array);
-
-        $this->urlAnonymizer->expects($this->once())->method('anonymize')
-            ->with($url)
-            ->willReturn($url);
-
-        $this->assertSame(
-            [
-                'extra' => [
-                    'ip' => '127.0.0.0',
-                    'url' => $url
-                ]
-            ],
-            $this->subject->__invoke([])
-        );
-    }
-
-    public function testInvokeCanReturnArrayWithIpV6(): void
-    {
-        $url = 'http://someurl';
-        $some_array = [
-            'extra' => [
-                'ip' => '2001:0db8:85a3:08d3::0370:7344',
-                'url' => $url
-            ]
-        ];
-
-        $this->webProcessor->expects($this->once())->method('__invoke')
-            ->with([])
-            ->willReturn($some_array);
-
-        $this->urlAnonymizer->expects($this->once())->method('anonymize')
-            ->with($url)
-            ->willReturn($url);
-
-        $this->assertSame(
-            [
-                'extra' => [
-                    'ip' => '2001:db8:85a3:8d3::',
-                    'url' => $url
-                ]
-            ],
-            $this->subject->__invoke([])
-        );
-    }
-}
diff --git a/tests/PHPUnit/Service/Logger/Services/URLAnonymizerTest.php b/tests/PHPUnit/Service/Logger/Services/URLAnonymizerTest.php
deleted file mode 100644
index 3214c3e91..000000000
--- a/tests/PHPUnit/Service/Logger/Services/URLAnonymizerTest.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace MolliePayments\Tests\Service\Logger\Services;
-
-use Kiener\MolliePayments\Service\Logger\Services\URLAnonymizer;
-use PHPUnit\Framework\TestCase;
-
-class URLAnonymizerTest extends TestCase
-{
-    /**
-     * The payment finalize URL has a token in the query.
-     * We need to make sure to remove this from the logs
-     * @return void
-     */
-    public function testPaymentFinalizeIsAnonymized(): void
-    {
-        $anonymizer = new URLAnonymizer();
-
-        $url = 'https://shop.phpunit.mollie/payment/finalize-transaction?token=abc';
-
-        $this->assertEquals('https://shop.phpunit.mollie/payment/finalize-transaction', $anonymizer->anonymize($url));
-    }
-}
diff --git a/tests/PHPUnit/Subscriber/CheckoutConfirmPageSubscriberTest.php b/tests/PHPUnit/Subscriber/CheckoutConfirmPageSubscriberTest.php
index f218b2138..7c298adbb 100644
--- a/tests/PHPUnit/Subscriber/CheckoutConfirmPageSubscriberTest.php
+++ b/tests/PHPUnit/Subscriber/CheckoutConfirmPageSubscriberTest.php
@@ -27,6 +27,7 @@ class CheckoutConfirmPageSubscriberTest extends TestCase
     /** @var CheckoutConfirmPage */
     private $checkoutConfirmPage;
 
+    private PaymentMethodCollection $paymentMethodCollection;
     /**
      * Sets up the test.
      *
diff --git a/tests/PHPUnit/Utils/Traits/PaymentBuilderTrait.php b/tests/PHPUnit/Utils/Traits/PaymentBuilderTrait.php
index 5796fbbe9..31994ee33 100644
--- a/tests/PHPUnit/Utils/Traits/PaymentBuilderTrait.php
+++ b/tests/PHPUnit/Utils/Traits/PaymentBuilderTrait.php
@@ -75,7 +75,7 @@ private function getDummyCustomer(CustomerAddressEntity $billing, CustomerAddres
      * @param null|CurrencyEntity $currency
      * @return array<string,mixed>
      */
-    public function getExpectedLineItems(string $taxStatus, ?OrderLineItemCollection $lineItems = null, CurrencyEntity $currency): array
+    public function getExpectedLineItems(string $taxStatus, OrderLineItemCollection $lineItems, CurrencyEntity $currency): array
     {
         $expectedLineItems = [];
 
@@ -99,7 +99,7 @@ public function getExpectedLineItems(string $taxStatus, ?OrderLineItemCollection
         return $hydrator->hydrate($expectedLineItems, $currency->getIsoCode());
     }
 
-    public function getExpectedDeliveries(string $taxStatus, ?OrderDeliveryCollection $deliveries = null, CurrencyEntity $currency): array
+    public function getExpectedDeliveries(string $taxStatus, OrderDeliveryCollection $deliveries, CurrencyEntity $currency): array
     {
         $mollieShippingLineItemBuilder = new MollieShippingLineItemBuilder(new PriceCalculator());
 
diff --git a/tests/Unit/Logger/FakeSettingsService.php b/tests/Unit/Logger/FakeSettingsService.php
new file mode 100644
index 000000000..214eb3ad8
--- /dev/null
+++ b/tests/Unit/Logger/FakeSettingsService.php
@@ -0,0 +1,29 @@
+<?php
+declare(strict_types=1);
+
+namespace Mollie\Unit\Logger;
+
+use Mollie\Shopware\Component\Settings\AbstractSettingsService;
+use Mollie\Shopware\Component\Settings\Struct\LoggerSettings;
+
+final class FakeSettingsService extends AbstractSettingsService
+{
+    private LoggerSettings $settings;
+
+    public function __construct(LoggerSettings $settings = null)
+    {
+        if($settings === null) {
+            $settings = new LoggerSettings(true,0);
+        }
+        $this->settings = $settings;
+    }
+    public function getDecorated(): AbstractSettingsService
+    {
+        // TODO: Implement getDecorated() method.
+    }
+
+    public function getLoggerSettings(?string $salesChannelId = null): LoggerSettings
+    {
+        return $this->settings;
+    }
+}
\ No newline at end of file
diff --git a/tests/Unit/Logger/PluginSettingsHandlerTest.php b/tests/Unit/Logger/PluginSettingsHandlerTest.php
new file mode 100644
index 000000000..80929c87b
--- /dev/null
+++ b/tests/Unit/Logger/PluginSettingsHandlerTest.php
@@ -0,0 +1,95 @@
+<?php
+declare(strict_types=1);
+
+namespace Mollie\Unit\Logger;
+
+use Doctrine\DBAL\Connection;
+use Mollie\Shopware\Component\Logger\PluginSettingsHandler;
+use Mollie\Shopware\Component\Settings\Struct\LoggerSettings;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LogLevel;
+
+
+#[CoversClass(PluginSettingsHandler::class)]
+/**
+ * @coversDefaultClass \Mollie\Shopware\Component\Logger\PluginSettingsHandler
+ */
+final class PluginSettingsHandlerTest extends TestCase
+{
+    public function testHandleIsFalseWithoutConnection(): void
+    {
+        $fakeSettingsService = new FakeSettingsService();
+
+        $connection = $this->createMock(Connection::class);
+        $connection->expects($this->once())->method('isConnected')->willReturn(false);
+
+        $handler = new PluginSettingsHandler($fakeSettingsService,$connection,'');
+        $record = [
+            'message' => 'test'
+        ];
+        $result = $handler->handle($record);
+
+        $this->assertFalse($result);
+    }
+    public function testHandleIsFalseForDifferentChannel(): void
+    {
+        $fakeSettingsService = new FakeSettingsService();
+
+        $connection = $this->createMock(Connection::class);
+        $connection->expects($this->once())->method('isConnected')->willReturn(true);
+
+        $handler = new PluginSettingsHandler($fakeSettingsService,$connection,'');
+        $record = [
+            'message' => 'test',
+            'channel' => 'test'
+        ];
+        $result = $handler->handle($record);
+
+        $this->assertFalse($result);
+    }
+    public function testHandleIsFalseFowLowerLogLevel(): void
+    {
+        $loggerSettings = new LoggerSettings(false,0);
+        $fakeSettingsService = new FakeSettingsService($loggerSettings);
+
+        $connection = $this->createMock(Connection::class);
+        $connection->expects($this->once())->method('isConnected')->willReturn(true);
+
+        $handler = new PluginSettingsHandler($fakeSettingsService,$connection,'');
+        $record = [
+            'message' => 'test',
+            'channel' => 'mollie',
+            'level' => LogLevel::DEBUG,
+
+            'extra'=>[],
+            'context'=>[],
+            'datetime'=>new \DateTime()
+        ];
+        $result = $handler->handle($record);
+
+        $this->assertFalse($result);
+    }
+    public function testHandleIsWorking():void
+    {
+        $loggerSettings = new LoggerSettings(true,0);
+        $fakeSettingsService = new FakeSettingsService($loggerSettings);
+
+        $connection = $this->createMock(Connection::class);
+        $connection->expects($this->once())->method('isConnected')->willReturn(true);
+
+        $handler = new PluginSettingsHandler($fakeSettingsService,$connection,'',false);
+        $record = [
+            'message' => 'test',
+            'channel' => 'mollie',
+            'level' => LogLevel::DEBUG,
+
+            'extra'=>[],
+            'context'=>[],
+            'datetime'=>new \DateTime()
+        ];
+        $result = $handler->handle($record);
+
+        $this->assertTrue($result);
+    }
+}
\ No newline at end of file
diff --git a/tests/Unit/Logger/RecordAnonymizerTest.php b/tests/Unit/Logger/RecordAnonymizerTest.php
new file mode 100644
index 000000000..55b90bc24
--- /dev/null
+++ b/tests/Unit/Logger/RecordAnonymizerTest.php
@@ -0,0 +1,92 @@
+<?php
+declare(strict_types=1);
+
+namespace Mollie\Unit\Logger;
+
+use Mollie\Shopware\Component\Logger\RecordAnonymizer;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\TestCase;
+
+
+/**
+ * @coversDefaultClass \Mollie\Shopware\Component\Logger\RecordAnonymizer
+ */
+#[CoversClass(RecordAnonymizer::class)]
+final class RecordAnonymizerTest extends TestCase
+{
+    public function testNothingIsAnonymized(): void
+    {
+        $anonymizer = new RecordAnonymizer();
+
+        $record = [
+            'message'=>'nothing has changed'
+        ];
+
+        $result = $anonymizer($record);
+
+        $this->assertSame($record,$result);
+    }
+
+    public function testIpIsAnonymized(): void
+    {
+        $anonymizer = new RecordAnonymizer();
+
+        $record = [
+            'message'=>'nothing has changed',
+            'extra'=>[
+                'ip'=>'127.0.0.1'
+            ]
+        ];
+
+        $result = $anonymizer($record);
+        $expected = [
+          'message'=>'nothing has changed',
+          'extra' =>[
+              'ip'=>'127.0.0.0'
+          ]
+        ];
+        $this->assertSame($expected,$result);
+    }
+    public function testIpV6IsAnonymized(): void
+    {
+        $anonymizer = new RecordAnonymizer();
+
+        $record = [
+            'message'=>'nothing has changed',
+            'extra'=>[
+                'ip'=>'3c3d:d7f6:25ef:29fd:f5b7:1fb1:4241:5208'
+            ]
+        ];
+
+        $result = $anonymizer($record);
+        $expected = [
+            'message'=>'nothing has changed',
+            'extra' =>[
+                'ip'=>'3c3d:d7f6:25ef:29fd::'
+            ]
+        ];
+        $this->assertSame($expected,$result);
+    }
+    public function testUrlParametersAreAnonymized(): void
+    {
+        $anonymizer = new RecordAnonymizer();
+
+        $record = [
+            'message'=>'nothing has changed',
+            'extra'=>[
+                'ip'=>'3c3d:d7f6:25ef:29fd:f5b7:1fb1:4241:5208',
+                'url'=>'https://shop.phpunit.mollie/payment/finalize-transaction?token=abc'
+            ]
+        ];
+
+        $result = $anonymizer($record);
+        $expected = [
+            'message'=>'nothing has changed',
+            'extra' =>[
+                'ip'=>'3c3d:d7f6:25ef:29fd::',
+                'url' => 'https://shop.phpunit.mollie/payment/finalize-transaction'
+            ]
+        ];
+        $this->assertSame($expected,$result);
+    }
+}
\ No newline at end of file
diff --git a/tests/bootstrap/functions.php b/tests/bootstrap/functions.php
new file mode 100644
index 000000000..97b84c735
--- /dev/null
+++ b/tests/bootstrap/functions.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @param string $key
+ * @return string|bool|null
+ */
+function getArgument(string $argument, string $default = null)
+{
+    $argv = $_SERVER['argv'];
+//remove command from args
+    array_shift($argv);
+
+    $argumentsWithEqualSign = [];
+    foreach ($argv as $index => $value) {
+        if (str_starts_with($value, '--')) {
+            $argumentsWithEqualSign[$index] = $value;
+            continue;
+        }
+        $argumentsWithEqualSign[$index - 1] .= "=" . $value;
+    }
+    $parsedArguments = [];
+    foreach ($argumentsWithEqualSign as $argumentWithEqual) {
+        $argumentWithEqual = trim(str_replace("-", "", $argumentWithEqual));
+        $argumentParts = explode("=", $argumentWithEqual);
+        $argumentName = $argumentParts[0];
+        $argumentValue = true;
+        if (isset($argumentParts[1])) {
+            $argumentValue = $argumentParts[1];
+        }
+
+        $parsedArguments[$argumentName] = $argumentValue;
+    }
+
+    if (! isset($parsedArguments[$argument])) {
+        return $default;
+    }
+    return $parsedArguments[$argument];
+}
diff --git a/tests/bootstrap/index.php b/tests/bootstrap/index.php
new file mode 100644
index 000000000..56a9431a0
--- /dev/null
+++ b/tests/bootstrap/index.php
@@ -0,0 +1,15 @@
+<?php
+
+
+require_once __DIR__ . '/functions.php';
+
+$testSuite = getArgument('testsuite');
+$testSuiteBootstrapFileName = sprintf('%s/%s.php', __DIR__, $testSuite);
+
+if (is_file($testSuiteBootstrapFileName)) {
+    require_once $testSuiteBootstrapFileName;
+    return;
+}
+
+require_once __DIR__ . '/../../vendor/autoload.php';
+
diff --git a/tests/bootstrap/integration.php b/tests/bootstrap/integration.php
new file mode 100644
index 000000000..4ae283ed3
--- /dev/null
+++ b/tests/bootstrap/integration.php
@@ -0,0 +1,20 @@
+<?php declare(strict_types=1);
+
+use Shopware\Core\TestBootstrapper;
+
+$projectDir = realpath(__DIR__ . '/../../../../../');
+
+$loader = (new TestBootstrapper())
+    ->setProjectDir($projectDir)
+    ->setPlatformEmbedded(false)
+    ->addCallingPlugin()
+    ->addActivePlugins('MolliePayments')
+    ->setForceInstallPlugins(true)
+    ->bootstrap()
+    ->getClassLoader();
+
+
+$loader->addPsr4('Kiener\\MolliePayments\\', __DIR__ . '/../../src/');
+$loader->addPsr4('Mollie\\Shopware\\', __DIR__ . '/../../shopware/');
+$loader->addPsr4("Shopware\\Core\\", __DIR__ . '/../../polyfill/Shopware/Core/');
+$loader->addPsr4('Mollie\\Integration\\', __DIR__ . '/../Integration/');