diff --git a/.changelog/3e80c9a9167b4d0ea3eb95f8b46b177a.md b/.changelog/3e80c9a9167b4d0ea3eb95f8b46b177a.md
new file mode 100644
index 0000000..c637a10
--- /dev/null
+++ b/.changelog/3e80c9a9167b4d0ea3eb95f8b46b177a.md
@@ -0,0 +1,4 @@
+---
+type: none
+---
+Fixes for geo-data.py action
\ No newline at end of file
diff --git a/.github/workflows/geo-data.yml b/.github/workflows/geo-data.yml
index b6afa3a..a1249ec 100644
--- a/.github/workflows/geo-data.yml
+++ b/.github/workflows/geo-data.yml
@@ -36,20 +36,16 @@ jobs:
           pip install virtualenv
       - name: Generate geo_data.py
         run: |
+          ./script/bootstrap
           source env/bin/activate
           ./script/generate-geo-data > octodns/record/geo_data.py
-          [ `git status --porcelain=1 | wc -l` -ne 0 ] && ./script/changelog create -t minor Periodic updates to geo_data.py
+          git diff
+          [ `git status --porcelain=1 | wc -l` -ne 0 ] && ./script/changelog create -t minor Periodic updates to geo_data.py || true
       - name: Create Pull Request
         id: cpr
         uses: peter-evans/create-pull-request@v7
         with:
-          token: ${{ secrets.PAT }}
           commit-message: Periodic updates to geo_data.py
-          committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
-          author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>
-          signoff: false
           branch: update-geo-data
-          delete-branch: true
-          title: 'Update geo data to reflect recent changes'
+          title: Update geo_data.py to reflect recent changes
           body: Auto-generated with https://github.com/peter-evans/create-pull-request
-          draft: false