diff --git a/.github/workflows/docspublish.yml b/.github/workflows/docspublish.yml
index d95b464b40..4ac9a3a4a4 100644
--- a/.github/workflows/docspublish.yml
+++ b/.github/workflows/docspublish.yml
@@ -6,13 +6,44 @@ on:
       - master
 
 jobs:
+  update-cli-screenshots:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+          fetch-depth: 0
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+      - name: Install dependencies
+        run: |
+          python -m pip install -U pip poetry
+          poetry --version
+          poetry install
+      - name: Update CLI screenshots
+        run: |
+          poetry run python scripts/gen_cli_help_screenshots.py
+      - name: Commit and push updated CLI screenshots
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git add docs/images/cli_help
+          git commit -m "docs(cli/screenshots): update CLI screenshots" -m "[skip ci]"
+          git push
+
   publish-documentation:
     runs-on: ubuntu-latest
+    needs: update-cli-screenshots
     steps:
       - uses: actions/checkout@v4
         with:
           token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}"
           fetch-depth: 0
+      - name: Pull latest changes
+        run: |
+          git pull origin master
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
diff --git a/.github/workflows/generate_cli_screenshots.yml b/.github/workflows/generate_cli_screenshots.yml
deleted file mode 100644
index 7bbc8b16d9..0000000000
--- a/.github/workflows/generate_cli_screenshots.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Generate CLI screenshots
-
-on:
-  pull_request:
-    types:
-      - closed
-
-jobs:
-  generate_cli_screenshots:
-    if: github.event.pull_request.merged == true
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}"
-          fetch-depth: 0
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.x"
-
-      - name: Install dependencies
-        run: |
-          python -m pip install -U pip poetry
-          poetry --version
-          poetry install
-
-      - name: Generate CLI screenshots
-        run: |
-          poetry run python scripts/gen_cli_help_screenshots.py
-
-      - name: Commit and push CLI screenshots
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git add docs/images/cli_help
-          git commit -m "docs(cli/screenshots) update CLI screenshots"
-          git push
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d3c9a02544..163e7a0ab3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -21,6 +21,7 @@ repos:
         exclude: "tests/((commands|data)/|test_).+"
       - id: trailing-whitespace
         args: [ --markdown-linebreak-ext=md ]
+        exclude: '\.svg$'
       - id: debug-statements
       - id: no-commit-to-branch
       - id: check-merge-conflict