diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 53451fc239..a050a91550 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -3,6 +3,8 @@
     "kaiwood.endwise",
     "misogi.ruby-rubocop",
     "rebornix.ruby",
-    "wingrunr21.vscode-ruby"
+    "wingrunr21.vscode-ruby",
+    "timonwong.shellcheck",
+    "foxundermoon.shell-format"
   ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9ebb6c4160..3e339e48d8 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,17 @@
 {
-    "ruby.rubocop.executePath": "Library/Homebrew/shims/gems/",
-    "files.trimTrailingWhitespace": true,
-    "editor.tabSize": 2,
-    "files.insertFinalNewline": true
+  "editor.insertSpaces": true,
+  "editor.tabSize": 2,
+  "files.encoding": "utf8",
+  "files.eol": "\n",
+  "files.trimTrailingWhitespace": true,
+  "files.insertFinalNewline": true,
+  "files.trimFinalNewlines": true,
+  "ruby.rubocop.executePath": "Library/Homebrew/shims/gems/",
+  "shellcheck.customArgs": [
+    "--shell=bash",
+    "--enable=all",
+    "--external-sources",
+    "--source-path=${workspaceFolder}/Library"
+  ],
+  "shellformat.flag": "-i 2 -ci"
 }