diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 04142ae3e..bc1bc66a3 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -23,3 +23,16 @@ jobs:
     with:
       dockerTag: nightly
       snapReleaseChannel: edge
+  re-run:
+    needs:
+    - test_and_package_stage
+    - changelog_stage
+    - nightly_deploy_stage
+    if: failure() && fromJSON(github.run_attempt) < 3
+    runs-on: ubuntu-latest
+    steps:
+      - env:
+          GH_REPO: ${{ github.repository }}
+          GH_TOKEN: ${{ github.token }}
+          GH_DEBUG: api
+        run: gh workflow run rerun.yml -F run_id=${{ github.run_id }}
diff --git a/.github/workflows/rerun.yml b/.github/workflows/rerun.yml
new file mode 100644
index 000000000..9524fc6e5
--- /dev/null
+++ b/.github/workflows/rerun.yml
@@ -0,0 +1,17 @@
+on:
+  workflow_dispatch:
+    inputs:
+      run_id:
+        required: true
+jobs:
+  rerun:
+    runs-on: ubuntu-latest
+    steps:
+      - name: rerun ${{ inputs.run_id }}
+        env:
+          GH_REPO: ${{ github.repository }}
+          GH_TOKEN: ${{ github.token }}
+          GH_DEBUG: api
+        run: |
+          gh run watch ${{ inputs.run_id }} > /dev/null 2>&1
+          gh run rerun ${{ inputs.run_id }} --failed