diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 5b9eb669a2..5b1e6594a9 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -11,7 +11,7 @@ on:
             - "packages/nocodb/**"
             - ".github/workflows/ci-cd.yml"
     pull_request:
-        types: [ready_for_review]
+        types: ['opened', 'edited', 'reopened', 'synchronize', 'ready_for_review']
         branches: [develop]
         paths:
             - "packages/nc-gui/**"
@@ -20,6 +20,7 @@ on:
             - ".github/workflows/ci-cd.yml"
 jobs:
     cypress-restTableOps-run-cache:
+      if: ! github.event.pull_request.draft
       runs-on: ubuntu-20.04
       steps:
         - name: Setup Node
@@ -64,6 +65,7 @@ jobs:
             path: scripts/cypress/screenshots
             retention-days: 2
     cypress-restViews-run-cache:
+      if: ! github.event.pull_request.draft
       runs-on: ubuntu-20.04
       steps:
         - name: Setup Node
@@ -108,6 +110,7 @@ jobs:
             path: scripts/cypress/screenshots
             retention-days: 2
     cypress-restRoles-run-cache:
+      if: ! github.event.pull_request.draft
       runs-on: ubuntu-20.04
       steps:
         - name: Setup Node
@@ -152,6 +155,7 @@ jobs:
             path: scripts/cypress/screenshots
             retention-days: 2
     cypress-restMisc-run-cache:
+      if: ! github.event.pull_request.draft
       runs-on: ubuntu-20.04
       steps:
         - name: Setup Node
@@ -196,6 +200,7 @@ jobs:
             path: scripts/cypress/screenshots
             retention-days: 2
     cypress-xcdb-restTableOps-run-cache:
+      if: ! github.event.pull_request.draft
       runs-on: ubuntu-20.04
       steps:
         - name: Setup Node
@@ -240,6 +245,7 @@ jobs:
             path: scripts/cypress/screenshots
             retention-days: 2
     cypress-xcdb-restViews-run-cache:
+      if: ! github.event.pull_request.draft
       runs-on: ubuntu-20.04
       steps:
         - name: Setup Node
@@ -284,6 +290,7 @@ jobs:
             path: scripts/cypress/screenshots
             retention-days: 2
     cypress-xcdb-restRoles-run-cache:
+      if: ! github.event.pull_request.draft
       runs-on: ubuntu-20.04
       steps:
         - name: Setup Node
@@ -328,6 +335,7 @@ jobs:
             path: scripts/cypress/screenshots
             retention-days: 2
     cypress-xcdb-restMisc-run-cache:
+      if: ! github.event.pull_request.draft
       runs-on: ubuntu-20.04
       steps:
         - name: Setup Node
@@ -372,6 +380,7 @@ jobs:
             path: scripts/cypress/screenshots
             retention-days: 2
     cypress-pg-restTableOps-run-cache:
+      if: ! github.event.pull_request.draft
       runs-on: ubuntu-20.04
       steps:
         - name: Setup Node
@@ -416,6 +425,7 @@ jobs:
             path: scripts/cypress/screenshots
             retention-days: 2
     cypress-pg-restViews-run-cache:
+      if: ! github.event.pull_request.draft
       runs-on: ubuntu-20.04
       steps:
         - name: Setup Node
@@ -460,6 +470,7 @@ jobs:
             path: scripts/cypress/screenshots
             retention-days: 2
     cypress-pg-restRoles-run-cache:
+      if: ! github.event.pull_request.draft
       runs-on: ubuntu-20.04
       steps:
         - name: Setup Node
@@ -504,6 +515,7 @@ jobs:
             path: scripts/cypress/screenshots
             retention-days: 2
     cypress-pg-restMisc-run-cache:
+      if: ! github.event.pull_request.draft
       runs-on: ubuntu-20.04
       steps:
         - name: Setup Node
@@ -548,6 +560,7 @@ jobs:
             path: scripts/cypress/screenshots
             retention-days: 2
     cy-quick-sqlite:
+      if: ! github.event.pull_request.draft
       runs-on: ubuntu-20.04
       steps:
         - name: Setup Node
@@ -593,6 +606,7 @@ jobs:
             path: scripts/cypress/screenshots
             retention-days: 2
     cy-quick-pg:
+      if: ! github.event.pull_request.draft
       runs-on: ubuntu-20.04
       steps:
         - name: Setup Node
@@ -637,6 +651,7 @@ jobs:
             path: scripts/cypress/screenshots
             retention-days: 2
     unit-tests:
+      if: ! github.event.pull_request.draft
       runs-on: ubuntu-20.04
       steps:
         - name: Setup Node