diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
index 0b2ccd8..6d39d38 100644
--- a/.github/workflows/pull_request.yaml
+++ b/.github/workflows/pull_request.yaml
@@ -7,9 +7,6 @@ on:
 jobs:
   lint:
     runs-on: ubuntu-latest
-    if: |
-      (github.repository == 'PolicyEngine/policyengine-us-data')
-      && (github.event.head_commit.message == 'Update PolicyEngine US data')
     name: Lint
     steps:
       - uses: actions/checkout@v4
@@ -26,9 +23,6 @@ jobs:
   check-version:
     name: Check version
     runs-on: ubuntu-latest
-    if: |
-      (github.repository == 'PolicyEngine/policyengine-us-data')
-      && !(github.event.head_commit.message == 'Update PolicyEngine US data')
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -46,21 +40,9 @@ jobs:
         run: ".github/get-changelog-diff.sh"
       - name: Check version number has been properly updated
         run: ".github/is-version-number-acceptable.sh"
-      - name: Update changelog
-        # if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-        uses: EndBug/add-and-commit@v9
-        with:
-          add: "."
-          committer_name: Github Actions[bot]
-          author_name: Github Actions[bot]
-          message: Update PolicyEngine US data
-          github_token: ${{ secrets.POLICYENGINE_GITHUB }}
   test:
     name: Build and test
     runs-on: ubuntu-latest
-    if: |
-      (github.repository == 'PolicyEngine/policyengine-us-data')
-      && (github.event.head_commit.message == 'Update PolicyEngine US data')
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
index da17667..13b8612 100644
--- a/.github/workflows/push.yaml
+++ b/.github/workflows/push.yaml
@@ -8,12 +8,9 @@ on:
 jobs:
   lint:
     runs-on: ubuntu-latest
-    if: >
-          github.event_name == 'pull_request' ||
-          (
-            github.repository == 'PolicyEngine/policyengine-us-data'
-            && github.event.head_commit.message == 'Update PolicyEngine US data'
-          )
+    if: |
+      (github.repository == 'PolicyEngine/policyengine-us-data')
+      && (github.event.head_commit.message == 'Update PolicyEngine US data')
     name: Lint
     steps:
       - uses: actions/checkout@v4
@@ -30,12 +27,9 @@ jobs:
   check-version:
     name: Check version
     runs-on: ubuntu-latest
-    if: >
-          github.event_name == 'pull_request' ||
-          (
-            github.repository == 'PolicyEngine/policyengine-us-data'
-            && github.event.head_commit.message != 'Update PolicyEngine US data'
-          )
+    if: |
+      (github.repository == 'PolicyEngine/policyengine-us-data')
+      && !(github.event.head_commit.message == 'Update PolicyEngine US data')
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -54,7 +48,6 @@ jobs:
       - name: Check version number has been properly updated
         run: ".github/is-version-number-acceptable.sh"
       - name: Update changelog
-        # if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         uses: EndBug/add-and-commit@v9
         with:
           add: "."
@@ -62,22 +55,12 @@ jobs:
           author_name: Github Actions[bot]
           message: Update PolicyEngine US data
           github_token: ${{ secrets.POLICYENGINE_GITHUB }}
-  debug-job:
-      runs-on: ubuntu-latest
-      steps:
-        - name: Checkout code
-          uses: actions/checkout@v4
-        - name: Debug info
-          run: |
-            echo "Event name: ${{ github.event_name }}"
-            echo "Repository: ${{ github.repository }}"
-            echo "Commit message: ${{ github.event.head_commit.message }}"
   test:
     name: Build and test
     runs-on: ubuntu-latest
-    if: >
-          github.event_name == 'pull_request' ||
-          github.repository == 'PolicyEngine/policyengine-us-data'
+    if: |
+      (github.repository == 'PolicyEngine/policyengine-us-data')
+      && (github.event.head_commit.message == 'Update PolicyEngine US data')
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -104,10 +87,9 @@ jobs:
   publish-to-pypi:
     name: Publish to PyPI
     runs-on: ubuntu-latest
-    if: >
-          github.repository == 'PolicyEngine/policyengine-us-data'
-          && github.event_name == 'push'
-          && github.event.head_commit.message == 'Update PolicyEngine US data'
+    if: |
+      (github.repository == 'PolicyEngine/policyengine-us-data')
+      && (github.event.head_commit.message == 'Update PolicyEngine US data')
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -132,10 +114,9 @@ jobs:
   docker:
     name: Docker
     runs-on: ubuntu-latest
-    if: >
-          github.repository == 'PolicyEngine/policyengine-us-data'
-          && github.event_name == 'push'
-          && github.event.head_commit.message == 'Update PolicyEngine US data'
+    if: |
+      (github.repository == 'PolicyEngine/policyengine-us-data')
+      && (github.event.head_commit.message == 'Update PolicyEngine US data')
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -152,10 +133,9 @@ jobs:
   publish-docs:
     name: Publish documentation
     runs-on: ubuntu-latest
-    if: >
-          github.repository == 'PolicyEngine/policyengine-us-data'
-          && github.event_name == 'push'
-          && github.event.head_commit.message == 'Update PolicyEngine US data'
+    if: |
+      (github.repository == 'PolicyEngine/policyengine-us-data')
+      && (github.event.head_commit.message == 'Update PolicyEngine US data')
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -179,10 +159,9 @@ jobs:
     name: Upload data 
     runs-on: ubuntu-latest
     needs: [lint, test]
-    if: >
-          github.repository == 'PolicyEngine/policyengine-us-data'
-          && github.event_name == 'push'
-          && github.event.head_commit.message == 'Update PolicyEngine US data'
+    if: |
+      (github.repository == 'PolicyEngine/policyengine-us-data')
+      && (github.event.head_commit.message == 'Update PolicyEngine US data')
     steps:
       - name: Checkout code
         uses: actions/checkout@v4