diff --git a/phpcs.xml b/phpcs.xml
index 3ffeebc67..dfd335d3c 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,15 +2,27 @@
 <ruleset name="October CMS">
     <description>The coding standard for October CMS.</description>
     <rule ref="PSR2">
+        <!--
+        Exceptions to the PSR-2 guidelines as per our Developer Guide:
+        https://octobercms.com/help/guidelines/developer#psr-exceptions
+        -->
         <exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps" />
+        <exclude name="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace" />
+        <exclude name="PSR2.ControlStructures.ControlStructureSpacing.SpacingAfterOpenBrace" />
+    </rule>
+
+    <rule ref="PSR1.Classes.ClassDeclaration.MissingNamespace">
+        <!--
+        Migration files do not need a namespace defined
+        -->
+        <exclude-pattern>*/database/migrations/*\.php</exclude-pattern>
     </rule>
 
     <file>bootstrap/</file>
     <file>config/</file>
     <file>modules/</file>
-    <file>tests</file>
+    <file>plugins/october/demo/</file>
+    <file>tests/</file>
 
-    <exclude-pattern>vendor/</exclude-pattern>
-    <exclude-pattern>storage/</exclude-pattern>
-    <exclude-pattern>plugins/</exclude-pattern>
+    <exclude-pattern>*/vendor/*</exclude-pattern>
 </ruleset>