diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
index 06c3a62d1f..640cd5f1dd 100644
--- a/.github/workflows/node.yml
+++ b/.github/workflows/node.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Cypress run
         uses: cypress-io/github-action@v2
         with:
-          start: docker run -p 8080:8080 -d --name xc-instant nocodb/nocodb:latest ; sleep 10
+          start: cd ./packages/nocodb/ && docker-compose run -d xc-cypress-test ; sleep 20
           wait-on: 'http://localhost:8080/dashboard'
   docker:
 
diff --git a/packages/nocodb/docker-compose.yml b/packages/nocodb/docker-compose.yml
index a5ed99f760..1f3b766ee9 100644
--- a/packages/nocodb/docker-compose.yml
+++ b/packages/nocodb/docker-compose.yml
@@ -439,3 +439,18 @@ services:
           cp /home/app/tests/sqlite-dump/sakila.db /home/sakila.db
           echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"#
           cd /home/app/  && npm i && npm run test:graphql
+
+
+    xc-cypress-test:
+      image: node:12.22.1-slim
+      ports:
+        - 8080:8080
+      volumes:
+        - ./:/home/app
+      command:
+        - /bin/bash
+        - -c
+        - |
+          echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+          cd /home/app/ && npm i && npm run watch:run
+