diff --git a/.github/workflows/sphinx.yml b/.github/workflows/sphinx.yml
index ccbe94dc7..1840bbe95 100644
--- a/.github/workflows/sphinx.yml
+++ b/.github/workflows/sphinx.yml
@@ -4,10 +4,14 @@ on:
     branches: [ "master" ]
   pull_request:
     branches: [ "master" ]
+    types:
+      - closed
 
 permissions: write-all
 jobs:
   docs:
+    if_merged:
+      if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-python@v4
diff --git a/build.gradle b/build.gradle
index 4974164dc..465a31c6d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -303,7 +303,7 @@ checkstyle {
 
 spotless {
     // optional: limit format enforcement to just the files changed by this feature branch
-    ratchetFrom 'origin/master'
+    ratchetFrom 'master'
 
     format 'misc', {
         // define the files to apply `misc` to