diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 9ab573373..0520e659c 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -51,6 +51,10 @@ parameters:
         - message: '#Call to deprecated method getLocalColumns\(\) of class Doctrine\\DBAL\\Schema\\ForeignKeyConstraint#'
           paths:
               - src/Profile/Shopware/Gateway/Local/Reader/AttributeReader.php
+        - identifier: shopware.stripTags
+          paths:
+              - src/Profile/Shopware/Converter/ShopwareConverter.php
+              - src/Profile/Shopware/Converter/TranslationConverter.php
 
         # TODO: The MainOrContainer type cannot fully express its state after nested array mutations
         - identifier: parameterByRef.type
@@ -71,8 +75,18 @@ parameters:
             - classConstant.deprecatedClass
             - method.deprecated
 
+services:
+    -
+        class: Shopware\Core\DevOps\StaticAnalyze\PHPStan\Rules\Deprecation\DeprecatedServiceDecoratorPattern
+    -
+        class: Shopware\Core\DevOps\StaticAnalyze\PHPStan\Rules\Deprecation\DeprecatedMethodsThrowDeprecationRule
+        arguments:
+            deprecationPatterns:
+                - @Shopware\Core\DevOps\StaticAnalyze\PHPStan\Rules\Deprecation\DeprecatedServiceDecoratorPattern
+        tags:
+            - phpstan.rules.rule
+
 rules:
-    - Shopware\Core\DevOps\StaticAnalyze\PHPStan\Rules\Deprecation\DeprecatedMethodsThrowDeprecationRule
     - Shopware\Core\DevOps\StaticAnalyze\PHPStan\Rules\Tests\CoversAttributeRule
     - Shopware\Core\DevOps\StaticAnalyze\PHPStan\Rules\Tests\MockingSimpleObjectsNotAllowedRule
     - Shopware\Core\DevOps\StaticAnalyze\PHPStan\Rules\DecorationPatternRule
diff --git a/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-create.png b/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-create.png
index 9a56890db..4fc3be825 100644
Binary files a/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-create.png and b/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-create.png differ
diff --git a/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-establish-local.png b/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-establish-local.png
index 5172ab2a3..c4cc8482d 100644
Binary files a/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-establish-local.png and b/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-establish-local.png differ
diff --git a/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-introduction.png b/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-introduction.png
index 76fc2f79b..0a2e7b6f7 100644
Binary files a/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-introduction.png and b/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-introduction.png differ
diff --git a/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-profiles.png b/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-profiles.png
index 5c7eedf6f..01ce19c32 100644
Binary files a/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-profiles.png and b/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-profiles.png differ
diff --git a/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-truncation.png b/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-truncation.png
index df2eaf7f0..f998d4662 100644
Binary files a/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-truncation.png and b/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/connection-wizard-truncation.png differ
diff --git a/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/main-page-data-selection-empty.png b/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/main-page-data-selection-empty.png
index 3245ac2bf..4416d8054 100644
Binary files a/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/main-page-data-selection-empty.png and b/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/main-page-data-selection-empty.png differ
diff --git a/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/main-page-data-selection.png b/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/main-page-data-selection.png
index 955830fbe..92547d395 100644
Binary files a/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/main-page-data-selection.png and b/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/main-page-data-selection.png differ
diff --git a/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/main-page-general-no-connection.png b/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/main-page-general-no-connection.png
index 15007210a..48ccc0b69 100644
Binary files a/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/main-page-general-no-connection.png and b/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/main-page-general-no-connection.png differ
diff --git a/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/main-page-general-with-connection.png b/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/main-page-general-with-connection.png
index 4aaa589b1..8dc73feed 100644
Binary files a/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/main-page-general-with-connection.png and b/tests/acceptance/snapshots/BasicVisualTest.spec.ts/linux/main-page-general-with-connection.png differ
diff --git a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/data-selection-assigment-with-errors.png b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/data-selection-assigment-with-errors.png
index 9862f6e53..88e2c9af8 100644
Binary files a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/data-selection-assigment-with-errors.png and b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/data-selection-assigment-with-errors.png differ
diff --git a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/data-selection-assigment-without-errors.png b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/data-selection-assigment-without-errors.png
index 672698a42..6671aae19 100644
Binary files a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/data-selection-assigment-without-errors.png and b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/data-selection-assigment-without-errors.png differ
diff --git a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/error-resolution-log-detail-fixed.png b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/error-resolution-log-detail-fixed.png
index 86d24505c..49ab65d92 100644
Binary files a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/error-resolution-log-detail-fixed.png and b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/error-resolution-log-detail-fixed.png differ
diff --git a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/error-resolution-log-detail-unfixed.png b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/error-resolution-log-detail-unfixed.png
index a937b516b..5d2d162c2 100644
Binary files a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/error-resolution-log-detail-unfixed.png and b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/error-resolution-log-detail-unfixed.png differ
diff --git a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/error-resolution-log-groups-fixed.png b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/error-resolution-log-groups-fixed.png
index 817ffd5e7..b82725ed3 100644
Binary files a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/error-resolution-log-groups-fixed.png and b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/error-resolution-log-groups-fixed.png differ
diff --git a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/error-resolution-log-groups-unfixed.png b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/error-resolution-log-groups-unfixed.png
index ee5252822..acc72d782 100644
Binary files a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/error-resolution-log-groups-unfixed.png and b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/error-resolution-log-groups-unfixed.png differ
diff --git a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/migration-history-details-modal.png b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/migration-history-details-modal.png
index 0587c2edb..3cab12880 100644
Binary files a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/migration-history-details-modal.png and b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/migration-history-details-modal.png differ
diff --git a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/migration-history-list.png b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/migration-history-list.png
index 205255230..5a25ed064 100644
Binary files a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/migration-history-list.png and b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/migration-history-list.png differ
diff --git a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/migration-process-started.png b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/migration-process-started.png
index 73a060df9..7b8c7d828 100644
Binary files a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/migration-process-started.png and b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/migration-process-started.png differ
diff --git a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/migration-process-summary.png b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/migration-process-summary.png
index 8bd67a934..b89b34881 100644
Binary files a/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/migration-process-summary.png and b/tests/acceptance/snapshots/MigrationTest.spec.ts/linux/migration-process-summary.png differ