diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index cb05ddb94c..5fe2c7255e 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -18,9 +18,12 @@ FROM mcr.microsoft.com/devcontainers/base:bullseye
 
 RUN apt-get update \
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends git-lfs \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+    && apt-get -y install \
+        git-lfs \
+        libssl-dev \
+        pkg-config \
+        build-essential \
+        protobuf-compiler
 
 # Install Rust
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 45996b1352..ecd5f5a7cb 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -7,15 +7,26 @@
     "remoteUser": "root",
     "features": {
         "ghcr.io/devcontainers/features/docker-in-docker:2": {
-            "moby": true,
-            "azureDnsAutoDetection": true,
-            "installDockerBuildx": true,
-            "version": "latest",
-            "dockerDashComposeVersion": "v2"
-        },
+			"moby": true,
+			"azureDnsAutoDetection": true,
+			"installDockerBuildx": true,
+			"version": "latest",
+			"dockerDashComposeVersion": "v2"
+		},
         "ghcr.io/devcontainers/features/nix:1": {
-            "multiUser": true,
-            "version": "latest"
-        }
-    }
+			"multiUser": true,
+			"version": "latest"
+		},
+		"ghcr.io/devcontainers/features/rust:1": {
+			"version": "latest",
+			"profile": "default"
+		}
+	},
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"rust-lang.rust-analyzer"
+			]
+		}
+	}
 }
\ No newline at end of file
diff --git a/.vscode/rivet.code-workspace b/.vscode/rivet.code-workspace
new file mode 100644
index 0000000000..cd7bd66dce
--- /dev/null
+++ b/.vscode/rivet.code-workspace
@@ -0,0 +1,15 @@
+{
+	"folders": [
+		{
+			"path": ".."
+		},
+		{
+			"path": "../lib/bolt"
+		}
+	],
+	"settings": {
+		"rust-analyzer.cargo.extraEnv": {
+			"RUSTFLAGS": "--cfg tokio_unstable"
+		}
+	}
+}
\ No newline at end of file