diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000..d8ca8beef9
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,14 @@
+{
+  "name": "KaTeX Codespaces",
+  "image": "mcr.microsoft.com/vscode/devcontainers/javascript-node:14",
+  "extensions": [
+    "dbaeumer.vscode-eslint",
+    "flowtype.flow-for-vscode",
+    "stylelint.vscode-stylelint",
+    "arcanis.vscode-zipfs"
+  ],
+  "settings": { 
+    "terminal.integrated.shell.linux": "/bin/bash"
+  },
+  "postCreateCommand": "git submodule update --init --recursive && CI=true yarn install"
+}
diff --git a/.gitpod.yml b/.gitpod.yml
index 8a50dacbf9..c3bc219d34 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,6 +1,6 @@
 tasks:
   - init: yarn install
-    command: yarn start --sockPort 443
+    command: yarn start
   - openMode: split-right
     command: echo "Run 'yarn test' to run tests."
 
diff --git a/webpack.dev.js b/webpack.dev.js
index 74d2f2f293..e90ea2d121 100644
--- a/webpack.dev.js
+++ b/webpack.dev.js
@@ -19,6 +19,7 @@ katexConfig.devServer = {
     disableHostCheck: true,
     host: '0.0.0.0',
     port: PORT,
+    sockPort: 'location',
     stats: {
         colors: true,
     },