diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 859f1987fd..9013768c37 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 5bbeacfc0b..f4d1c4b252 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,8 +3,11 @@
 # and another the rest of the directory.
 
 # All your base
-*                   @DataDog/container-integrations @DataDog/container-ecosystems
+*                       @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
+README.md               @DataDog/documentation @DataDog/container-integrations @DataDog/container-ecosystems
+/docs/                  @DataDog/documentation @DataDog/container-integrations @DataDog/container-ecosystems