diff --git a/.github/workflows/testing-suite.yml b/.github/workflows/testing-suite.yml
index 981282a..f882705 100644
--- a/.github/workflows/testing-suite.yml
+++ b/.github/workflows/testing-suite.yml
@@ -21,6 +21,7 @@ jobs:
 
       - name: Install Dependencies
         run: |
+          git config --global --add safe.directory "*"
           composer2 install --dev --prefer-dist --no-scripts --no-progress --optimize-autoloader --no-interaction -vvv
           composer2 show
         shell: bash
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14a3de4..590531f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Commit Message validator to validate the commit message adheres to the 
   [Conventional Commit Message structure](https://cheatography.com/albelop/cheat-sheets/conventional-commits/)
   and that the commit message contains a Jira ticket number it relates to.
+- Prevent installation of `phpro/grumphp-shim:2.18.0` to prevent error "symfony/cache" conflicts with extension `redis`
+  , see [github link](https://github.com/phpro/grumphp-shim/issues/30) 
 
 ### Changed
 - [BREAKING] The composer.json configurations `config.youwe-testing-suite.type` and `config.mediact-testing-suite.type`
@@ -52,6 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Default Pimcore coding standards disables PHPCS in favour of PHP CS Fixer.
 - JSON Lint will ignore folders `.ddev/` and `tests/fixtures/`.
 - Added Symfony function `dump()` to the git blacklist for all project types
+- Added new excludes to magento 2 phpcs rules.
 
 ### Removed
 - Removed support for EOL PHP versions. Projects running PHP < 8.1 can stick to version 2 of the testing-suite.
diff --git a/composer.json b/composer.json
index eb6d8aa..45cab79 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
         "php-cs-fixer/shim": "@stable",
         "php-parallel-lint/php-parallel-lint": "^1.4",
         "phpmd/phpmd": "^2.15 || 3.x-dev",
-        "phpro/grumphp-shim": "^2.15",
+        "phpro/grumphp-shim": "^2.15 !=2.18.0",
         "phpstan/phpstan": "@stable",
         "squizlabs/php_codesniffer": "^3.12.0",
         "youwe/composer-dependency-installer": "^2.0",
diff --git a/config/magento2/ruleset.xml b/config/magento2/ruleset.xml
index 5eefd8d..1222edc 100644
--- a/config/magento2/ruleset.xml
+++ b/config/magento2/ruleset.xml
@@ -5,5 +5,15 @@
     <!-- Use default Youwe coding standards for PHP projects. -->
     <rule ref="../default" />
     <!-- Magento coding standards -->
-    <rule ref="Magento2" />
-</ruleset>
\ No newline at end of file
+    <rule ref="Magento2" >
+        <!-- Not all functions require doc blocks -->
+        <exclude name="Magento2.Annotation.MethodAnnotationStructure.NoCommentBlock"/>
+        <!-- Not all class properties require doc blocks -->
+        <exclude name="Magento2.Commenting.ClassPropertyPHPDocFormatting.Missing"/>
+        <!--
+        This conflicts with PSR12.ControlStructures.ControlStructureSpacing.FirstExpressionLine
+        Which is used when a line is too long.
+        -->
+        <exclude name="PSR2.ControlStructures.ControlStructureSpacing.SpacingAfterOpenBrace"/>
+    </rule>
+</ruleset>