diff --git a/.gitattributes b/.gitattributes
index 71c67f90..3e83867b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11,7 +11,7 @@
 .scrutinizer.yml export-ignore
 infection.json.dist export-ignore
 phpbench.json export-ignore
-phpcs.xml.dist export-ignore
+phpcs.xml export-ignore
 phpstan.neon.dist export-ignore
 phpstan-baseline.neon export-ignore
 psalm.xml export-ignore
diff --git a/.gitignore b/.gitignore
index 9bc6509b..1686331c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,6 @@ coverage.xml
 .php_cs.cache
 *sw[op]
 phpunit.xml
-phpcs.xml
 .phpunit.result.cache
 phpstan.neon
 # Infection
diff --git a/composer.json b/composer.json
index df2604e2..a6cf6d5b 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
     },
     "require-dev": {
         "phpbench/phpbench": "^1.6",
-        "phpmyadmin/coding-standard": "^4.1",
+        "phpmyadmin/coding-standard": "^5.0",
         "phpmyadmin/motranslator": "^5.4",
         "phpstan/extension-installer": "^1.4.3",
         "phpstan/phpstan": "^2.1.46",
diff --git a/phpcs.xml.dist b/phpcs.xml
similarity index 73%
rename from phpcs.xml.dist
rename to phpcs.xml
index 2faed13f..79f44109 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml
@@ -22,16 +22,13 @@
         <exclude-pattern>src/Contexts/*</exclude-pattern>
     </rule>
 
-    <rule ref="SlevomatCodingStandard.ControlStructures.RequireSingleLineCondition"/>
-    <rule ref="SlevomatCodingStandard.Functions.RequireSingleLineCall"/>
-    <rule ref="SlevomatCodingStandard.Whitespaces.DuplicateSpaces">
-        <properties>
-            <property name="ignoreSpacesInComment" value="true"/>
-        </properties>
-    </rule>
-
     <rule ref="Squiz.Arrays.ArrayDeclaration.IndexNoNewline">
         <exclude-pattern>src/Contexts/*</exclude-pattern>
         <exclude-pattern>tests/Tools/templates/*</exclude-pattern>
     </rule>
+
+    <!-- Rules that should be followed, but are not required -->
+    <rule ref="SlevomatCodingStandard.PHP.RequireExplicitAssertion">
+        <severity>4</severity>
+    </rule>
 </ruleset>