diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
deleted file mode 100644
index cef1d1183e727..0000000000000
--- a/.devcontainer/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/blob/v0.245.2/containers/javascript-node/.devcontainer/base.Dockerfile
-
-# [Choice] Node.js version: 18, 16, 14
-ARG VARIANT="18-buster"
-FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
-
-RUN sudo -u node npm install -g hereby
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c3bce9a875852..d0c07bb86fa3d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,11 +1,26 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node
 {
     "name": "Node.js",
-    "build": {
-        "dockerfile": "Dockerfile",
-        "args": {
-            "VARIANT": "18"
-        }
+    // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+    "image": "mcr.microsoft.com/devcontainers/javascript-node:1-22-bookworm",
+
+    // Features to add to the dev container. More info: https://containers.dev/features.
+    "features": {
+        "ghcr.io/devcontainers/features/go:1": {}
+    },
+
+    // Use 'forwardPorts' to make a list of ports inside the container available locally.
+    // "forwardPorts": [],
+
+    // Use 'postCreateCommand' to run commands after the container is created.
+    "postCreateCommand": {
+        "Configure Build Tools": "sudo corepack enable npm; sudo npm install -g hereby; npm ci",
+        "Install pprof": "go install github.com/google/pprof@latest",
+        "Install Graphviz": "sudo apt install graphviz"
     },
+
+    // Configure tool-specific properties.
     "customizations": {
         "vscode": {
             "settings": {
@@ -23,5 +38,7 @@
             ]
         }
     },
+
+    // More info: https://aka.ms/dev-containers-non-root.
     "remoteUser": "node"
 }
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 63cbb735019b5..8487f45d76100 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,7 +1,8 @@
 # To get started with Dependabot version updates, you'll need to specify which
 # package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
+# Please see the documentation for more information:
 # https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://containers.dev/guide/dependabot
 
 version: 2
 updates:
@@ -13,3 +14,8 @@ updates:
       github-actions:
         patterns:
           - '*'
+
+  - package-ecosystem: 'devcontainers'
+    directory: '/'
+    schedule:
+      interval: weekly