diff --git a/.github/workflows/build_cmake_tarball.yml b/.github/workflows/build_cmake_tarball.yml
index facc3c121e..106e1fa788 100644
--- a/.github/workflows/build_cmake_tarball.yml
+++ b/.github/workflows/build_cmake_tarball.yml
@@ -44,7 +44,7 @@ on:
 
 jobs:
   on-success:
-    if: (github.event_name == 'schedule' && github.repository == 'DLR-AMR/t8code') || (github.event_name != 'schedule')
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-20.04
     container: dlramr/t8code-ubuntu:t8-dependencies
     timeout-minutes: 90
diff --git a/.github/workflows/create_from_cmake_tarball.yml b/.github/workflows/create_from_cmake_tarball.yml
index 49ba899efa..b68a37bdde 100644
--- a/.github/workflows/create_from_cmake_tarball.yml
+++ b/.github/workflows/create_from_cmake_tarball.yml
@@ -37,14 +37,14 @@ on:
     branches:
       - main
       - develop
-  workflow_dispatch: 
   workflow_run:
     workflows: [Build tarball using CMake]
     types: [completed]
+  workflow_dispatch: 
 
 jobs:
   on-success:
-    if: (github.event_name == 'schedule' && github.repository == 'DLR-AMR/t8code') || (github.event_name != 'schedule')
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-20.04
     container: dlramr/t8code-ubuntu:t8-dependencies
     timeout-minutes: 90