diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 859f1987f..9013768c3 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-	"image": "mcr.microsoft.com/devcontainers/go:1.21-bookworm",
+	"image": "mcr.microsoft.com/devcontainers/go:dev-1.22",
 	"features": {
 		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {},
 	},
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5bbeacfc0..cf7803502 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,6 +5,9 @@
 # All your base
 *                   @DataDog/container-integrations @DataDog/container-ecosystems
 
+# Dev Container
+/.devcontainer          @DataDog/container-ecosystems @DataDog/container-platform
+
 # Documentation
 README.md             @DataDog/documentation @DataDog/container-integrations @DataDog/container-ecosystems
 /docs/                @DataDog/documentation @DataDog/container-integrations @DataDog/container-ecosystems