diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 4534c7e2..1dd68f24 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update -qq \
       wget \ 
       curl \
       dos2unix \
-      clang-format \
+      clang-format-12 \
       clang-tidy \
       locales \
       libncurses5 \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 223b651f..778fe9cb 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -19,7 +19,9 @@
 	"extensions": [
 		"ms-vscode.cpptools",
 		"ms-vscode.cmake-tools",
-		"marus25.cortex-debug"
+		"marus25.cortex-debug",
+		"notskm.clang-tidy",
+		"mjohns.clang-format"
 	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 3b686626..8f0e63f4 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,5 +4,6 @@
         "-DARM_NONE_EABI_TOOLCHAIN_PATH=${env:ARM_NONE_EABI_TOOLCHAIN_PATH}",
         "-DNRF5_SDK_PATH=${env:NRF5_SDK_PATH}",
     ],
-    "cmake.generator": "Unix Makefiles"
+    "cmake.generator": "Unix Makefiles",
+    "clang-tidy.buildPath": "build/compile_commands.json"
 }