diff --git a/.devcontainer/codeforlife-portal-react/devcontainer.json b/.devcontainer/codeforlife-portal-react/devcontainer.json
new file mode 100644
index 00000000..d71329af
--- /dev/null
+++ b/.devcontainer/codeforlife-portal-react/devcontainer.json
@@ -0,0 +1,29 @@
+{
+  "name": "codeforlife-portal-react",
+  "dockerComposeFile": [
+    "../../docker-compose.yml"
+  ],
+  "service": "base-service",
+  "shutdownAction": "none",
+  "workspaceFolder": "/workspace/codeforlife-portal-react",
+  "remoteUser": "root",
+  "postCreateCommand": "./run",
+  "features": {
+    "ghcr.io/devcontainers/features/python:1": {
+      "version": "3.8"
+    },
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "18"
+    }
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "python.defaultInterpreterPath": ".venv/bin/python"
+      },
+      "extensions": [
+        "ms-python.python"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/.devcontainer/codeforlife-portal/devcontainer.json b/.devcontainer/codeforlife-portal/devcontainer.json
new file mode 100644
index 00000000..1f63af1d
--- /dev/null
+++ b/.devcontainer/codeforlife-portal/devcontainer.json
@@ -0,0 +1,29 @@
+{
+  "name": "codeforlife-portal",
+  "dockerComposeFile": [
+    "../../docker-compose.yml"
+  ],
+  "service": "base-service",
+  "shutdownAction": "none",
+  "workspaceFolder": "/workspace/codeforlife-portal",
+  "remoteUser": "root",
+  "postCreateCommand": "pipenv install --dev",
+  "features": {
+    "ghcr.io/devcontainers/features/python:1": {
+      "version": "3.8"
+    },
+    "ghcr.io/devcontainers-contrib/features/pipenv:2": {
+      "version": "2023.11.15"
+    }
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "python.defaultInterpreterPath": ".venv/bin/python"
+      },
+      "extensions": [
+        "ms-python.python"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
deleted file mode 100644
index ade5a776..00000000
--- a/.devcontainer/devcontainer.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "name": "codeforlife",
-  "image": "mcr.microsoft.com/vscode/devcontainers/python:3.8",
-  "features": {
-    "ghcr.io/devcontainers/features/node:1": {
-      "version": "16"
-    },
-    "ghcr.io/devcontainers-contrib/features/pipenv:2": {
-      "version": "2023.11.15"
-    }
-  },
-  // "mounts": [
-  //   "source=../codeforlife-portal,target=home/root/codeforlife-portal,type=bind,consistency=cached"
-  // ]
-  "customizations": {
-    "vscode": {
-      "settings": {},
-      "extensions": [
-        "ms-python.python",
-        "dbaeumer.vscode-eslint"
-      ]
-    }
-  }
-}
diff --git a/.devcontainer/rapid-router/devcontainer.json b/.devcontainer/rapid-router/devcontainer.json
new file mode 100644
index 00000000..ca205986
--- /dev/null
+++ b/.devcontainer/rapid-router/devcontainer.json
@@ -0,0 +1,29 @@
+{
+  "name": "rapid-router",
+  "dockerComposeFile": [
+    "../../docker-compose.yml"
+  ],
+  "service": "base-service",
+  "shutdownAction": "none",
+  "workspaceFolder": "/workspace/rapid-router",
+  "remoteUser": "root",
+  "postCreateCommand": "pipenv install --dev",
+  "features": {
+    "ghcr.io/devcontainers/features/python:1": {
+      "version": "3.8"
+    },
+    "ghcr.io/devcontainers-contrib/features/pipenv:2": {
+      "version": "2023.11.15"
+    }
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "python.defaultInterpreterPath": ".venv/bin/python"
+      },
+      "extensions": [
+        "ms-python.python"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/codeforlife-portal b/codeforlife-portal
index 704caacd..410e3480 160000
--- a/codeforlife-portal
+++ b/codeforlife-portal
@@ -1 +1 @@
-Subproject commit 704caacd1febf19e965186fdd1185041524cd375
+Subproject commit 410e3480486d719e871e24f1fe8c46bec1651dcb
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..3946d0c3
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,9 @@
+# https://github.com/devcontainers
+version: '1'
+services:
+  base-service:
+    image: mcr.microsoft.com/devcontainers/base:ubuntu-22.04
+    volumes:
+      # Mount the root folder that contains .git
+      - .:/workspace:cached
+    command: sleep infinity
diff --git a/rapid-router b/rapid-router
index afd3290f..3689e251 160000
--- a/rapid-router
+++ b/rapid-router
@@ -1 +1 @@
-Subproject commit afd3290f842ce3c0a31eb56b1ae399408c555044
+Subproject commit 3689e251694da440c3f9cffe713b0844a108deb7