diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1b5dacbf..51938e5b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,6 +8,7 @@ on:
 
 env:
   APP_TITLE: ${{ vars.APP_TITLE }}
+  APP_GRAPHQL_CODEGEN_ENDPOINT: ${{ vars.APP_GRAPHQL_CODEGEN_ENDPOINT }}
   GITHUB_WORKFLOW: true
 
 jobs:
@@ -16,6 +17,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - uses: pnpm/action-setup@v4
         name: Install pnpm
@@ -37,6 +40,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - uses: pnpm/action-setup@v4
         name: Install pnpm
@@ -58,6 +63,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - uses: pnpm/action-setup@v4
         name: Install pnpm
@@ -100,6 +107,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - uses: pnpm/action-setup@v4
         name: Install pnpm
@@ -122,6 +131,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - uses: pnpm/action-setup@v4
         name: Install pnpm
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..18cf160f
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "backend"]
+	path = backend
+	url = git@github.com:toggle-corp/ai-chatbot-backend.git
diff --git a/Dockerfile b/Dockerfile
index 0b92c8be..46e39aca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ RUN apt-get update -y \
         git bash g++ make \
     && rm -rf /var/lib/apt/lists/*
 
-RUN npm install pnpm
+RUN npm install -g pnpm
 
 WORKDIR /code
 
diff --git a/backend b/backend
new file mode 160000
index 00000000..6b18ccd8
--- /dev/null
+++ b/backend
@@ -0,0 +1 @@
+Subproject commit 6b18ccd86ed185cba2f2e7867996d63ff6bfbddf
diff --git a/docker-compose-with-backend.yml b/docker-compose-with-backend.yml
new file mode 100644
index 00000000..59b584a0
--- /dev/null
+++ b/docker-compose-with-backend.yml
@@ -0,0 +1,14 @@
+name: chatbot
+
+services:
+  react:
+    build: ../
+    command: sh -c 'pnpm install && pnpm start --host'
+    environment:
+      APP_TITLE: ${APP_TITLE:- CMS}
+    volumes:
+      - ../:/code
+    ports:
+      - 127.0.0.1:3000:3000
+    depends_on:
+      - web
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 3f19cad0..00000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-version: '3.8'
-services:
-  react:
-    build: .
-    command: sh -c 'yarn install && yarn dev --host'
-    environment:
-      APP_TITLE: ${APP_TITLE:-React Base App}
-    volumes:
-      - .:/code
-    ports:
-      - '3000:3000'