diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..a4931324
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = false
+insert_final_newline = false
diff --git a/defaults/main.yml b/defaults/main.yml
index 9d9473ef..36526eb3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -834,27 +834,27 @@ ubtu22cis_rsyslog_ansible_managed: true
 ## Controls 5.2.4/5/13/14/15/18/20/21/22 -- various sshd settings
 ubtu22cis_sshd_default_log_level: "INFO"
 ubtu22cis_sshd_default_ciphers:
-        - chacha20-poly1305@openssh.com
-        - aes256-gcm@openssh.com
-        - aes128-gcm@openssh.com
-        - aes256-ctr
-        - aes192-ctr
-        - aes128-ctr
+    - chacha20-poly1305@openssh.com
+    - aes256-gcm@openssh.com
+    - aes128-gcm@openssh.com
+    - aes256-ctr
+    - aes192-ctr
+    - aes128-ctr
 ubtu22cis_sshd_default_macs:
-        - hmac-sha2-512-etm@openssh.com
-        - hmac-sha2-256-etm@openssh.com
-        - hmac-sha2-512
-        - hmac-sha2-256
+    - hmac-sha2-512-etm@openssh.com
+    - hmac-sha2-256-etm@openssh.com
+    - hmac-sha2-512
+    - hmac-sha2-256
 ubtu22cis_sshd_default_kex_algorithms:
-        - curve25519-sha256
-        - curve25519-sha256@libssh.org
-        - diffie-hellman-group14-sha256
-        - diffie-hellman-group16-sha512
-        - diffie-hellman-group18-sha512
-        - ecdh-sha2-nistp521
-        - ecdh-sha2-nistp384
-        - ecdh-sha2-nistp256
-        - diffie-hellman-group-exchange-sha256
+    - curve25519-sha256
+    - curve25519-sha256@libssh.org
+    - diffie-hellman-group14-sha256
+    - diffie-hellman-group16-sha512
+    - diffie-hellman-group18-sha512
+    - ecdh-sha2-nistp521
+    - ecdh-sha2-nistp384
+    - ecdh-sha2-nistp256
+    - diffie-hellman-group-exchange-sha256
 ubtu22cis_sshd_default_max_auth_tries: 4
 ubtu22cis_sshd_default_max_sessions: 8
 ubtu22cis_sshd_default_login_grace_time: 60