diff --git a/.github/workflows/pull-changes-from-upstream.yml b/.github/workflows/pull-changes-from-upstream.yml
new file mode 100644
index 0000000000..fc5cfea91f
--- /dev/null
+++ b/.github/workflows/pull-changes-from-upstream.yml
@@ -0,0 +1,52 @@
+name: Pull from upstream
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron:  '0 8 * * 1,4'
+jobs:
+  pull-from-upstream-master:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Reset the default branch with upstream changes
+        run: |
+          git remote add upstream https://github.com/tendermint/tendermint.git
+          git fetch upstream master:upstream-master
+          git reset --hard upstream-master
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        with:
+          token: ${{ secrets.PULL_UPSTREAM }}
+          commit-message: Upstream changes
+          title: Upstream changes from master
+          body: |
+            please review and fix any conflicts before merging
+            Auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
+          branch: upstream-changes-master
+          base: master
+          delete-branch: true
+          reviewers: evan-forbes
+
+  pull-from-upstream-release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Reset the default branch with upstream changes
+        run: |
+          git remote add upstream https://github.com/tendermint/tendermint.git
+          git fetch upstream v0.34.x:upstream-release-v0.34.x
+          git reset --hard upstream-release-v0.34.x
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        with:
+          token: ${{ secrets.PULL_UPSTREAM }}
+          commit-message: Upstream changes
+          title: Upstream changes from the release branch
+          body: |
+            please review and fix any conflicts before merging
+            Auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
+          branch: upstream-changes-release/v0.34.x
+          base: v0.34.x-celestia
+          delete-branch: true
+          reviewers: evan-forbes