diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c53467ab8c..a9ac652d18 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -29,7 +29,8 @@
 		"twxs.cmake",
 		"uavcan.dsdl",
 		"wholroyd.jinja",
-		"zixuanwang.linkerscript"
+		"zixuanwang.linkerscript",
+		"ms-vscode.makefile-tools"
 	],
 
 	"containerUser": "user",
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index b49f659083..ec49a0c75f 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -18,6 +18,7 @@
         "twxs.cmake",
         "uavcan.dsdl",
         "wholroyd.jinja",
-        "zixuanwang.linkerscript"
+        "zixuanwang.linkerscript",
+        "ms-vscode.makefile-tools"
     ]
 }