diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 768921c8..ddb3f6a8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,15 +9,12 @@ concurrency:
 jobs:
   stubs:
     # Pushes should only run on mainline branch "development"
-    # TODO: We can also skip this, if the latest commit's name is "Update Stub Files"
-    if: github.event_name == 'push' && github.repository == 'AMReX-Codes/pyamrex' && github.ref == 'refs/heads/development'
     name: 🔄 Update Stub Files
     secrets:
       PYAMREX_PUSH_TOKEN: ${{ secrets.PYAMREX_PUSH_TOKEN }}
     uses: ./.github/workflows/stubs.yml
 
   ubuntu:
-    if: always() && !contains(needs.*.result, 'failure') && github.event.pull_request.draft == false
     name: 🐧 Ubuntu
     needs: [stubs]
     uses: ./.github/workflows/ubuntu.yml
diff --git a/.github/workflows/stubs.yml b/.github/workflows/stubs.yml
index 409b734c..0e387089 100644
--- a/.github/workflows/stubs.yml
+++ b/.github/workflows/stubs.yml
@@ -84,5 +84,6 @@ jobs:
 
     - uses: stefanzweifel/git-auto-commit-action@v5
       name: Commit Updated Stub Files
+      if: github.event_name == 'push' && github.repository == 'AMReX-Codes/pyamrex' && github.ref == 'refs/heads/development'
       with:
         commit_message: Update Stub Files