diff --git a/.yamlfmt b/.yamlfmt
new file mode 100644
index 0000000..b341109
--- /dev/null
+++ b/.yamlfmt
@@ -0,0 +1,7 @@
+doublestar: true
+include:
+  - './**/*.{yaml,yml}'
+  - '.yamlfmt'
+formatter:
+  type: basic
+  retain_line_breaks: true
diff --git a/scripts/format.bash b/scripts/format.bash
index 70123b9..e3ea3e0 100755
--- a/scripts/format.bash
+++ b/scripts/format.bash
@@ -4,3 +4,5 @@ shfmt --language-dialect bash --write \
 	./**/*
 
 dprint fmt
+
+yamlfmt
diff --git a/scripts/lint.bash b/scripts/lint.bash
index 6bfa67b..3ebb914 100755
--- a/scripts/lint.bash
+++ b/scripts/lint.bash
@@ -9,3 +9,5 @@ shfmt --language-dialect bash --diff \
 	./**/*
 
 dprint check
+
+yamlfmt -lint