diff --git a/.github/workflows/integrity.yml b/.github/workflows/integrity.yml
new file mode 100644
index 00000000..07b77948
--- /dev/null
+++ b/.github/workflows/integrity.yml
@@ -0,0 +1,38 @@
+# Workflow to run basic integrity checks on OMT`s new Pull Requests and commits pushed into OMT repo
+
+name: OpenMapTiles Integrity CI
+
+on:
+  push:
+    branches: [ master, master-tools ]
+  pull_request:
+
+jobs:
+
+  integrity_test:
+    name: Run integrity test
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout the changes
+        uses: actions/checkout@v2
+
+      - name: Run quickstart for a small area
+        env:
+          area: monaco
+          MIN_ZOOM: 0
+          MAX_ZOOM: 14
+          QUIET: 1
+        run: |
+          ./quickstart.sh $area
+
+      - name: Save quickstart.log
+        uses: actions/upload-artifact@v2
+        with:
+          name: quickstart.log
+          path: quickstart.log
+
+      - name: Test etldoc images
+        run: |
+          export TEST_MODE=yes
+          make generate-devdoc
diff --git a/.github/workflows/tests.yml b/.github/workflows/performance.yml
similarity index 95%
rename from .github/workflows/tests.yml
rename to .github/workflows/performance.yml
index ccee82c6..28fcbfe0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/performance.yml
@@ -1,6 +1,6 @@
-# Workflow to validate OMT`s new Pull Requests and commits pushed into OMT repo
+# Workflow to run performance tests OMT`s new Pull Requests and commits pushed into OMT repo
 
-name: OpenMapTiles CI
+name: OpenMapTiles Performance CI
 
 on:
   push:
@@ -8,35 +8,6 @@ on:
   pull_request:
 
 jobs:
-
-  integrity_test:
-    name: Run integrity test
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Checkout the changes
-        uses: actions/checkout@v2
-
-      - name: Run quickstart for a small area
-        env:
-          area: monaco
-          MIN_ZOOM: 0
-          MAX_ZOOM: 14
-          QUIET: 1
-        run: |
-          ./quickstart.sh $area
-
-      - name: Save quickstart.log
-        uses: actions/upload-artifact@v2
-        with:
-          name: quickstart.log
-          path: quickstart.log
-
-      - name: Test etldoc images
-        run: |
-          export TEST_MODE=yes
-          make generate-devdoc
-
   performance:
     name: Evaluate performance
     runs-on: self-hosted
diff --git a/.github/workflows/pr-updater.yml b/.github/workflows/pr-updater.yml
index d309e0e3..f9896ce8 100644
--- a/.github/workflows/pr-updater.yml
+++ b/.github/workflows/pr-updater.yml
@@ -1,15 +1,14 @@
 name: Update PR comments
 
 on:
-  # This number should correspond to the IGNORE_RUNS_OLDER_THAN value below.
-  # When setting up for the first time, use "on: push" instead of "on: schedule"
-  # and set IGNORE_RUNS_OLDER_THAN to a very high number until it runs once.
-  schedule:
-    - cron: '*/6 * * * *'
+  workflow_run:
+    workflows: ["OpenMapTiles Performance CI"]
+    types: [completed]
 
 jobs:
   update_PRs:
     runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
 
     steps:
       - name: main