diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index e83ba9921f..7e8df26cf6 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -22,6 +22,7 @@ on:
 jobs:
     cypress-restTableOps-run-cache:
       runs-on: ubuntu-20.04
+      timeout-minutes: 30
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
       steps:
         - name: Setup Node
@@ -67,6 +68,7 @@ jobs:
             retention-days: 2
     cypress-restViews-run-cache:
       runs-on: ubuntu-20.04
+      timeout-minutes: 30
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
       steps:
         - name: Setup Node
@@ -112,6 +114,7 @@ jobs:
             retention-days: 2
     cypress-restRoles-run-cache:
       runs-on: ubuntu-20.04
+      timeout-minutes: 30
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
       steps:
         - name: Setup Node
@@ -157,6 +160,7 @@ jobs:
             retention-days: 2
     cypress-restMisc-run-cache:
       runs-on: ubuntu-20.04
+      timeout-minutes: 30
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
       steps:
         - name: Setup Node
@@ -202,6 +206,7 @@ jobs:
             retention-days: 2
     cypress-xcdb-restTableOps-run-cache:
       runs-on: ubuntu-20.04
+      timeout-minutes: 30
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
       steps:
         - name: Setup Node
@@ -247,6 +252,7 @@ jobs:
             retention-days: 2
     cypress-xcdb-restViews-run-cache:
       runs-on: ubuntu-20.04
+      timeout-minutes: 30
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
       steps:
         - name: Setup Node
@@ -292,6 +298,7 @@ jobs:
             retention-days: 2
     cypress-xcdb-restRoles-run-cache:
       runs-on: ubuntu-20.04
+      timeout-minutes: 30
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
       steps:
         - name: Setup Node
@@ -337,6 +344,7 @@ jobs:
             retention-days: 2
     cypress-xcdb-restMisc-run-cache:
       runs-on: ubuntu-20.04
+      timeout-minutes: 30
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
       steps:
         - name: Setup Node
@@ -382,6 +390,7 @@ jobs:
             retention-days: 2
     cypress-pg-restTableOps-run-cache:
       runs-on: ubuntu-20.04
+      timeout-minutes: 30
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
       steps:
         - name: Setup Node
@@ -427,6 +436,7 @@ jobs:
             retention-days: 2
     cypress-pg-restViews-run-cache:
       runs-on: ubuntu-20.04
+      timeout-minutes: 30
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
       steps:
         - name: Setup Node
@@ -472,6 +482,7 @@ jobs:
             retention-days: 2
     cypress-pg-restRoles-run-cache:
       runs-on: ubuntu-20.04
+      timeout-minutes: 30
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
       steps:
         - name: Setup Node
@@ -517,6 +528,7 @@ jobs:
             retention-days: 2
     cypress-pg-restMisc-run-cache:
       runs-on: ubuntu-20.04
+      timeout-minutes: 30
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
       steps:
         - name: Setup Node
@@ -562,6 +574,7 @@ jobs:
             retention-days: 2
     cy-quick-sqlite:
       runs-on: ubuntu-20.04
+      timeout-minutes: 30
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
       steps:
         - name: Setup Node
@@ -608,6 +621,7 @@ jobs:
             retention-days: 2
     cy-quick-pg:
       runs-on: ubuntu-20.04
+      timeout-minutes: 30
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
       steps:
         - name: Setup Node
@@ -653,6 +667,7 @@ jobs:
             retention-days: 2
     unit-tests:
       runs-on: ubuntu-20.04
+      timeout-minutes: 30
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
       steps:
         - name: Setup Node
@@ -693,6 +708,7 @@ jobs:
           run: npm run test:unit
     cypress-db-independent:
       runs-on: ubuntu-20.04
+      timeout-minutes: 30
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
       steps:
         - name: Setup Node