diff --git a/build-plugin/action.yml b/build-plugin/action.yml
index f4a5c0f..8fda07f 100644
--- a/build-plugin/action.yml
+++ b/build-plugin/action.yml
@@ -68,7 +68,7 @@ runs:
   steps:
     - name: Package plugin
       id: "package-plugin"
-      uses: grafana/plugin-actions/package-plugin@main # zizmor: ignore[unpinned-uses]
+      uses: grafana/plugin-actions/package-plugin@eriksundell/plugin-docs-build-step # zizmor: ignore[unpinned-uses]
       with:
         policy_token: ${{ inputs.policy_token }}
         sign_root_urls: ${{ inputs.sign_root_urls }}
diff --git a/package-plugin/action.yml b/package-plugin/action.yml
index 1c7d185..571e2a2 100644
--- a/package-plugin/action.yml
+++ b/package-plugin/action.yml
@@ -73,6 +73,14 @@ runs:
       run: ${{ github.action_path }}/pm.sh build
       shell: bash
 
+    - name: Build plugin documentation
+      shell: bash
+      run: |
+        DOCS_PATH=$(cat dist/plugin.json | jq -r '.docsPath // empty')
+        if [ -n "$DOCS_PATH" ]; then
+          npx --yes @grafana/plugin-docs-cli build
+        fi
+
     - name: Check for backend
       id: check-for-backend
       run: |