diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 000000000000..d04ce451dfd3
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,31 @@
+{
+    "name": "Addons Server Development",
+    "dockerComposeFile": ["../docker-compose.yml"],
+    "service": "web",
+    "workspaceFolder": "/data/olympia",
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-python.python",
+                "ms-python.vscode-pylance",
+                "dbaeumer.vscode-eslint",
+                "esbenp.prettier-vscode",
+                "editorconfig.editorconfig",
+                "github.vscode-github-actions"
+            ],
+            "settings": {
+                "python.defaultInterpreterPath": "/usr/local/bin/python",
+                "python.linting.enabled": true,
+                "python.formatting.provider": "black",
+                "editor.formatOnSave": true,
+                "editor.codeActionsOnSave": {
+                    "source.fixAll.eslint": true
+                }
+            }
+        }
+    },
+    "forwardPorts": [80],
+    "initializeCommand": "make up_pre",
+    "postStartCommand": "make up_post",
+    "remoteUser": "olympia"
+}
diff --git a/.gitignore b/.gitignore
index d2a01bd4f2c1..f04b4adee5cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@ tmp/*
 
 # do not ignore the following files
 !docker-compose.private.yml
+!.devcontainer/docker-compose.devcontainer.yml
 !private/README.md
 !storage/.gitignore
 !deps/.gitkeep