diff --git a/.devcontainer/devcontainer.json b/.devcontainer/ubuntu20.04/devcontainer.json
similarity index 84%
rename from .devcontainer/devcontainer.json
rename to .devcontainer/ubuntu20.04/devcontainer.json
index ec4c2690b70..325e6e57fdc 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/ubuntu20.04/devcontainer.json
@@ -1,4 +1,5 @@
 {
+  "name": "Ubuntu 20.04",
   "image": "ghcr.io/spack/ubuntu20.04-runner-amd64-gcc-11.4:2023.08.01",
   "postCreateCommand": "./.devcontainer/postCreateCommand.sh"
 }
diff --git a/.devcontainer/ubuntu22.04/devcontainer.json b/.devcontainer/ubuntu22.04/devcontainer.json
new file mode 100644
index 00000000000..c4b5d24302b
--- /dev/null
+++ b/.devcontainer/ubuntu22.04/devcontainer.json
@@ -0,0 +1,5 @@
+{
+  "name": "Ubuntu 22.04",
+  "image": "ghcr.io/spack/ubuntu-22.04:v2024-05-07",
+  "postCreateCommand": "./.devcontainer/postCreateCommand.sh"
+}