diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
index 52e092b..710747a 100644
--- a/.github/workflows/pull-request.yaml
+++ b/.github/workflows/pull-request.yaml
@@ -29,9 +29,8 @@ jobs:
       - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: 22
-      - name: setup and build
-        # https://github.com/npm/cli/issues/3034#issuecomment-885211061
+      - name: build and start
         run: |
-          npm ci
-          npm run build
+          docker compose up --build -d
+          docker compose down
         working-directory: ${{ matrix.pkg }}
diff --git a/opa-react-demo/.dockerignore b/opa-react-demo/.dockerignore
new file mode 100644
index 0000000..07e6e47
--- /dev/null
+++ b/opa-react-demo/.dockerignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/opa-react-demo/Caddyfile b/opa-react-demo/Caddyfile
new file mode 100644
index 0000000..60236a1
--- /dev/null
+++ b/opa-react-demo/Caddyfile
@@ -0,0 +1,12 @@
+:4000 {
+    handle_path /eopa/* {
+        reverse_proxy http://eopa:8181
+    }
+
+    # serve the react app
+    handle {
+      root * /usr/share/caddy
+      try_files {path} /
+      file_server
+   }
+}
diff --git a/opa-react-demo/Dockerfile b/opa-react-demo/Dockerfile
index 6cf91e5..c065a46 100644
--- a/opa-react-demo/Dockerfile
+++ b/opa-react-demo/Dockerfile
@@ -1,15 +1,11 @@
-FROM node:22
+FROM node:22 AS builder
 
-# Create app directory
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
-
-# Install app dependencies
-COPY package.json /usr/src/app/
-RUN npm install
-
-# Bundle app source
 COPY . /usr/src/app
+RUN npm ci
+RUN npm run build
 
-EXPOSE 3000
-CMD [ "npm", "start" ]
\ No newline at end of file
+FROM caddy:latest
+COPY --from=builder /usr/src/app/build /usr/share/caddy
+COPY Caddyfile /etc/caddy/Caddyfile
diff --git a/opa-react-demo/README.md b/opa-react-demo/README.md
index bf00e60..f630535 100644
--- a/opa-react-demo/README.md
+++ b/opa-react-demo/README.md
@@ -8,7 +8,7 @@ This React application showcases the request batching feature of `@styra/opa-rea
 
 1. Set `$EOPA_LICENSE_KEY`
 1. Run `docker compose up`
-1. Go to <http://127.0.0.1:3000>
+1. Go to <http://127.0.0.1:4000>
 
 ### Binaries
 
diff --git a/opa-react-demo/docker-compose.yaml b/opa-react-demo/docker-compose.yaml
index 9ff269f..7fb0835 100644
--- a/opa-react-demo/docker-compose.yaml
+++ b/opa-react-demo/docker-compose.yaml
@@ -1,19 +1,13 @@
 services:
   react-demo:
     build: .
-    expose:
-    - 3000
+    ports:
+      - "4000:4000"
     depends_on:
       - eopa
-    command:
-      - npm
-      - start
-    network_mode: host
 
   eopa:
     image: ghcr.io/styrainc/enterprise-opa:latest
-    expose: 
-      - 8181
     ports:
       - "8181:8181"
     command:
@@ -22,8 +16,7 @@ services:
       - --addr=:8181
       - --log-level=debug
       - /policies
-    working_dir: /
     volumes:
       - ./policies:/policies
     environment:
-      EOPA_LICENSE_KEY: ${EOPA_LICENSE_KEY}
\ No newline at end of file
+      EOPA_LICENSE_KEY: ${EOPA_LICENSE_KEY}
diff --git a/opa-react-demo/package-lock.json b/opa-react-demo/package-lock.json
index 1e8daea..a88246e 100644
--- a/opa-react-demo/package-lock.json
+++ b/opa-react-demo/package-lock.json
@@ -23270,17 +23270,16 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
-      "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==",
-      "license": "Apache-2.0",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
       "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=14.17"
+        "node": ">=4.2.0"
       }
     },
     "node_modules/unbox-primitive": {
diff --git a/opa-react-demo/src/BatchDemo.jsx b/opa-react-demo/src/BatchDemo.jsx
index 6a37979..0c51757 100644
--- a/opa-react-demo/src/BatchDemo.jsx
+++ b/opa-react-demo/src/BatchDemo.jsx
@@ -23,7 +23,7 @@ export default function BatchDemo() {
   const [opaClient] = useState(() => {
     const href = window.location.toString();
     const u = new URL(href); // TODO(sr): better way?!
-    u.pathname = "";
+    u.pathname = "eopa";
     u.search = "";
     return new OPAClient(u.toString());
   });