diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 39ababb..0487716 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,8 +1,8 @@
 {
   "name": "GCT Generator",
-  "build": {
-    "dockerfile": "Dockerfile",
-  },
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "application",
+  "workspaceFolder": "/workspace",
   "settings": {
     "terminal.integrated.defaultProfile.linux": "bash"
   },
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
new file mode 100644
index 0000000..b7f0d8a
--- /dev/null
+++ b/.devcontainer/docker-compose.yml
@@ -0,0 +1,23 @@
+version: '3.7'
+
+services:
+  application:
+    container_name: gct-generator
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        VARIANT: 16
+        USER_UID: 1000
+        USER_GID: 1000
+    volumes:
+      - ..:/workspace:cached
+      - ~/.ssh:/home/node/.ssh:ro
+      - /var/run/docker.sock:/var/run/docker.sock
+    command: sleep infinity
+    user: node
+    env_file:
+      - ./workspace.env
+    ports:
+      - 8080:8080
+      - 3000:3000
diff --git a/.devcontainer/workspace.env b/.devcontainer/workspace.env
new file mode 100644
index 0000000..1598fe8
--- /dev/null
+++ b/.devcontainer/workspace.env
@@ -0,0 +1 @@
+# Left empty intentionally
\ No newline at end of file