diff --git a/.github/workflows/events-ocasional.yml b/.github/workflows/events-ocasional.yml
new file mode 100644
index 0000000000..a6cd43a837
--- /dev/null
+++ b/.github/workflows/events-ocasional.yml
@@ -0,0 +1,26 @@
+name: Ocasional events
+
+on:
+  push:
+    branches: [master, "release/*"]
+  pull_request_target: {}
+
+jobs:
+
+  # autoupdate is a GitHub Action that auto-updates pull requests branches whenever changes land on their destination branch.
+  # see: https://github.com/marketplace/actions/auto-update
+  pr-auto-update:
+    name: Auto-update PR
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: docker://chinthakagodawita/autoupdate-action:v1
+        # todo: this shall be resolved with https://github.com/chinthakagodawita/autoupdate/issues/100
+        continue-on-error: true
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          DRY_RUN: "false"
+          PR_FILTER: "labelled"
+          PR_LABELS: "0:] Ready-To-Go,has conflicts"
+          MERGE_MSG: "Branch was auto-updated."
+          RETRY_COUNT: "3"
+          RETRY_SLEEP: "500"
diff --git a/.github/workflows/events-recurrent.yml b/.github/workflows/events-recurrent.yml
index 30ccbcd11a..6b9382e299 100644
--- a/.github/workflows/events-recurrent.yml
+++ b/.github/workflows/events-recurrent.yml
@@ -1,8 +1,7 @@
 name: Recurrent events
 
 on:
-  push:
-    branches: [master, "release/*"]
+  push: {}
 
 jobs:
 
@@ -19,19 +18,3 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           MAX_RETRIES: 3
           WAIT_MS: 5000
-
-  # autoupdate is a GitHub Action that auto-updates pull requests branches whenever changes land on their destination branch.
-  # see: https://github.com/marketplace/actions/auto-update
-  pr-auto-update:
-    name: Auto-update PR
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: docker://chinthakagodawita/autoupdate-action:v1
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          DRY_RUN: "false"
-          PR_FILTER: "labelled"
-          PR_LABELS: "0:] Ready-To-Go"
-          MERGE_MSG: "Branch was auto-updated."
-          RETRY_COUNT: "3"
-          RETRY_SLEEP: "500"