diff --git a/.devcontainer/devcontainer.json b/server/.devcontainer/devcontainer.json
similarity index 81%
rename from .devcontainer/devcontainer.json
rename to server/.devcontainer/devcontainer.json
index deddcd5..b3d2e55 100644
--- a/.devcontainer/devcontainer.json
+++ b/server/.devcontainer/devcontainer.json
@@ -1,9 +1,6 @@
 {
   "name": "Java 21 Dev Container",
   "image": "mcr.microsoft.com/openjdk/jdk:21-ubuntu",
-  "settings": {
-    "java.home": "/usr/lib/jvm/msopenjdk-21-amd64"
-  },
   "features": {
     "ghcr.io/devcontainers/features/java:1": {
       "installMaven": "true"
diff --git a/ui/.devcontainer/Dockerfile b/ui/.devcontainer/Dockerfile
new file mode 100644
index 0000000..86a80ab
--- /dev/null
+++ b/ui/.devcontainer/Dockerfile
@@ -0,0 +1,15 @@
+ARG VARIANT=latest
+FROM oven/bun:${VARIANT}
+
+RUN apt-get update \
+    && apt-get -y install --no-install-recommends \
+    ca-certificates \
+    git \
+    nano \
+    vim-tiny \
+    && apt-get auto-remove -y \
+    && apt-get clean -y \
+    && chsh -s $(which bash) bun \
+    && echo 'export PS1="\e[01;32m\u\e[m:\e[01;34m\w\e[m\$ "' >> /home/bun/.bashrc
+
+USER bun
diff --git a/ui/.devcontainer/devcontainer.json b/ui/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..0924311
--- /dev/null
+++ b/ui/.devcontainer/devcontainer.json
@@ -0,0 +1,10 @@
+{
+  "name": "Bun",
+  "build": {
+    "dockerfile": "Dockerfile",
+    // Update 'VARIANT' to pick a Bun version.
+    "args": {
+      "VARIANT": "latest"
+    }
+  }
+}