diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2ad952e..fc8ec61 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -6,19 +6,26 @@ on:
 
 jobs:
   build-devcontainer-image:
-    name: Release Please
+    name: Build devcontainer image
     runs-on: ubuntu-latest
     timeout-minutes: 30
     permissions:
       contents: read
       packages: write
 
+    strategy:
+      matrix:
+        image: [
+          "typescript-node", 
+          "universal"
+        ]
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2 
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -27,7 +34,8 @@ jobs:
       - name: Pre-build dev container image
         uses: devcontainers/ci@v0.3
         with:
-          subFolder: typescript-node
-          imageName: ghcr.io/codesandbox/devcontainers/typescript-node
-          cacheFrom: ghcr.io/codesandbox/devcontainers/typescript-node
+          subFolder: ${{ matrix.image }}
+          imageName: ghcr.io/codesandbox/devcontainers/${{ matrix.image }}
+          imageTag: 0.1
+          cacheFrom: ghcr.io/codesandbox/devcontainers/${{ matrix.image }}
           push: always
\ No newline at end of file
diff --git a/universal/.devcontainer/Dockerfile b/universal/.devcontainer/Dockerfile
new file mode 100644
index 0000000..0048270
--- /dev/null
+++ b/universal/.devcontainer/Dockerfile
@@ -0,0 +1,3 @@
+FROM mcr.microsoft.com/devcontainers/universal:2-focal
+
+USER root
\ No newline at end of file
diff --git a/universal/.devcontainer/devcontainer.json b/universal/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..ba9e10a
--- /dev/null
+++ b/universal/.devcontainer/devcontainer.json
@@ -0,0 +1,11 @@
+{
+    "name": "CodeSandbox Universal",
+    "build": {
+        "context": ".",
+        "dockerfile": "Dockerfile"
+    },
+    "features": {
+        "ghcr.io/codesandbox/devcontainer-features/codesandbox:0.1.4": {}
+    },
+    "remoteUser": "root"
+}
\ No newline at end of file