diff --git a/integration-tests/deviations/coding-standards.yaml b/integration-tests/deviations/coding-standards.yaml
new file mode 100644
index 0000000000..d4130bae72
--- /dev/null
+++ b/integration-tests/deviations/coding-standards.yaml
@@ -0,0 +1,11 @@
+deviations:
+  - rule-id: "A0-1-1"
+    query-id: "cpp/autosar/useless-assignment" 
+    justification: "This useless assignment is required."
+    background: |
+      ## Useless assignments
+
+      We don't want to use useless assignments because they are useless.
+  - rule-id: "A0-4-2"
+    justification: "long double is required for interaction with third-pary libraries."
+    code-identifier: "a0-4-2-deviation"
\ No newline at end of file
diff --git a/integration-tests/deviations/nested/coding-standards.yaml b/integration-tests/deviations/nested/coding-standards.yaml
new file mode 100644
index 0000000000..d2e9bff31f
--- /dev/null
+++ b/integration-tests/deviations/nested/coding-standards.yaml
@@ -0,0 +1,5 @@
+deviations:
+  - rule-id: "A0-1-2"
+    justification: |
+      The return values in this file are not required because ...
+    path: "nested2"
\ No newline at end of file
diff --git a/scripts/deviations/process_coding_standards_config.py b/scripts/deviations/process_coding_standards_config.py
index 1f1f9053b5..bc1c96b24c 100644
--- a/scripts/deviations/process_coding_standards_config.py
+++ b/scripts/deviations/process_coding_standards_config.py
@@ -105,8 +105,9 @@ def main():
                 f"The specified working directory '{args.working_dir}'' does not exist.", file=sys.stderr)
             sys.exit(1)
 
-    # Find all the coding-standards.yml files, and convert them in place to coding-standards.xml
-    for path in args.working_dir.rglob('coding-standards.yml'):
+    # Find all coding standards deviations files, and convert them in place to coding-standards.xml
+    for config_file_name in ['coding-standards.yml', 'coding-standards.yaml']:
+      for path in args.working_dir.rglob(config_file_name):
         convert_yaml_file_to_xml(path)
 
     if not args.skip_indexing: