diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..f2c988df
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,21 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v6.0.0
+    hooks:
+      - id: trailing-whitespace
+      - id: check-yaml
+      - id: check-added-large-files
+        args:
+          - "--maxkb=10000"
+      - id: check-merge-conflict
+      - id: check-json
+      - id: mixed-line-ending
+      - id: fix-byte-order-marker
+      - id: debug-statements
+
+  - repo: https://github.com/google/yamlfmt
+    rev: v0.20.0
+    hooks:
+      - id: yamlfmt
+        args:
+          - "--verbose"
diff --git a/.yamlfmt b/.yamlfmt
new file mode 100644
index 00000000..dfdb3644
--- /dev/null
+++ b/.yamlfmt
@@ -0,0 +1,14 @@
+# yamlfmt configuration file
+# See https://github.com/google/yamlfmt for more options
+
+formatter:
+  indent: 2
+  trim_trailing_whitespace: true
+  eof_newline: true
+  force_array_style: block
+  retain_line_breaks_single: true
+  indentless_arrays: true
+  verbose: true
+  
+exclude:
+  - ".git/**"
diff --git a/atomics/T1110.003/T1110.003.yaml b/atomics/T1110.003/T1110.003.yaml
index 870fa6da..f0f7b6a7 100644
--- a/atomics/T1110.003/T1110.003.yaml
+++ b/atomics/T1110.003/T1110.003.yaml
@@ -3,7 +3,7 @@ display_name: 'Brute Force: Password Spraying'
 atomic_tests:
 - name: Password Spray all Domain Users
   auto_generated_guid: 90bc2e54-6c84-47a5-9439-0a2a92b4b175
-  description:
+  description: |
     CAUTION! Be very careful to not exceed the password lockout threshold for users in the domain by running this test too frequently.
 
     This atomic attempts to map the IPC$ share on one of the Domain Controllers using a password of Spring2020 for each user in the %temp%\users.txt list.
diff --git a/atomics/T1559.002/T1559.002.yaml b/atomics/T1559.002/T1559.002.yaml
index c4b9feec..efb03c1f 100644
--- a/atomics/T1559.002/T1559.002.yaml
+++ b/atomics/T1559.002/T1559.002.yaml
@@ -34,7 +34,6 @@ atomic_tests:
 - name: DDEAUTO
   auto_generated_guid: cf91174c-4e74-414e-bec0-8d60a104d181
   description: |
-
     TrustedSec - Unicorn - https://github.com/trustedsec/unicorn
 
     SensePost DDEAUTO - https://sensepost.com/blog/2017/macro-less-code-exec-in-msword/