diff --git a/.devcontainer.json b/.devcontainer.json
new file mode 100644
index 000000000..2f6920618
--- /dev/null
+++ b/.devcontainer.json
@@ -0,0 +1,12 @@
+{
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "mkhl.direnv"
+      ]
+    }
+  },
+  "image": "ghcr.io/cachix/devenv:latest",
+  "overrideCommand": false,
+  "updateContentCommand": "devenv test"
+}
diff --git a/devenv.nix b/devenv.nix
index 1904c4287..03373c78d 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -7,6 +7,9 @@
     pkgs.yq
     pkgs.pre-commit
     pkgs.kubectl
+    pkgs.helm
+    pkgs.helmfile
+    pkgs.tilt
     pkgs.awscli
     pkgs.yarn
   ];
@@ -28,4 +31,6 @@
     package = pkgs.go_1_22;
   };
   languages.terraform.enable = true;
+
+  devcontainer.enable = true;
 }
\ No newline at end of file