diff --git a/composer.json b/composer.json
index 445b2f3..8f925e8 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
     },
     "require-dev": {
         "brain/monkey": "^2.6.1",
-        "syde/phpcs": "1.0.0-rc.1",
+        "inpsyde/php-coding-standards": "^2.0.0",
         "roots/wordpress-no-content": "@dev",
         "mikey179/vfsstream": "^v1.6.11",
         "phpunit/phpunit": "^9.6.19",
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 579165f..f63b65f 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -1,23 +1,46 @@
 <?xml version="1.0"?>
 <ruleset>
-
     <file>./src</file>
+    <file>./tests</file>
 
     <arg value="sp"/>
     <arg name="colors"/>
     <config name="testVersion" value="7.4-"/>
+    <config name="ignore_warnings_on_exit" value="1"/>
+
+    <rule ref="Inpsyde">
+        <exclude name="WordPress.PHP.DevelopmentFunctions.error_log_trigger_error" />
+    </rule>
 
-    <rule ref="Syde-Extra">
-        <exclude name="SlevomatCodingStandard.Functions.RequireTrailingCommaInCall.MissingTrailingComma" />
-        <exclude name="SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration.MissingTrailingComma" />
+    <rule ref="Inpsyde.CodeQuality.Psr4">
+        <properties>
+            <property
+                name="psr4"
+                type="array"
+                value="
+                    Inpsyde\Modularity=>src,
+                    Inpsyde\Modularity\Tests=>tests/src,
+                    Inpsyde\Modularity\Tests\Unit=>tests/unit"
+            />
+        </properties>
     </rule>
 
-    <rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
-    	<properties>
-    		<property name="rootNamespaces" type="array">
-    			<element key="src" value="Inpsyde\Modularity" />
-    			<element key="tests/phpunit/Unit" value="Inpsyde\Modularity\Tests\Unit" />
-    		</property>
-    	</properties>
-    </rule>
-</ruleset>
\ No newline at end of file
+    <rule ref="Inpsyde.CodeQuality.FunctionLength">
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="Inpsyde.CodeQuality.ForbiddenPublicProperty">
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="WordPress.PHP.DevelopmentFunctions">
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="WordPress.PHP.DiscouragedPHPFunctions">
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="WordPress.Security.EscapeOutput">
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="Squiz.PHP.Eval">
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+</ruleset>
diff --git a/src/Container/ServiceExtensions.php b/src/Container/ServiceExtensions.php
index c31840b..5d93693 100644
--- a/src/Container/ServiceExtensions.php
+++ b/src/Container/ServiceExtensions.php
@@ -94,8 +94,8 @@ protected function resolveById(string $id, $service, Container $container)
      *
      * @return mixed
      *
-     * phpcs:disable SlevomatCodingStandard.Complexity.Cognitive.ComplexityTooHigh
-     * phpcs:disable Syde.Functions.ReturnTypeDeclaration.NoReturnType
+     * phpcs:disable Generic.Metrics.CyclomaticComplexity.TooHigh
+     * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration.NoReturnType
      */
     protected function resolveByType(
         string $className,
@@ -103,8 +103,6 @@ protected function resolveByType(
         Container $container,
         array $extendedClasses = []
     ) {
-        // phpcs:enable Generic.Metrics.CyclomaticComplexity
-        // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
 
         $extendedClasses[] = $className;
 
diff --git a/src/Properties/LibraryProperties.php b/src/Properties/LibraryProperties.php
index b3e5421..7023158 100644
--- a/src/Properties/LibraryProperties.php
+++ b/src/Properties/LibraryProperties.php
@@ -40,7 +40,7 @@ class LibraryProperties extends BaseProperties
      *
      * @return LibraryProperties
      *
-     * phpcs:disable SlevomatCodingStandard.Complexity.Cognitive.ComplexityTooHigh
+     * phpcs:disable Generic.Metrics.CyclomaticComplexity.TooHigh
      * phpcs:disable Syde.Functions.FunctionLength.TooLong
      */
     public static function new(string $composerJsonFile, ?string $baseUrl = null): LibraryProperties