diff --git a/.github/workflows/code_validation.yml b/.github/workflows/code_validation.yml
index 15e195d4..227ee897 100644
--- a/.github/workflows/code_validation.yml
+++ b/.github/workflows/code_validation.yml
@@ -31,7 +31,7 @@ jobs:
       - run: pnpm test
 
   run-linters:
-    name: Execute linters
+    name: Linting
     runs-on: ubuntu-latest
 
     steps:
@@ -48,21 +48,25 @@ jobs:
       - run: pnpm install prettier
 
       - run: pnpm install --frozen-lockfile
+        id: install_dependencies 
 
       - name: ESLint
         uses: reviewdog/action-eslint@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          reporter: github-pr-check
+          reporter: github-pr-annotations
           filter_mode: ${{ (github.event_name == 'pull_request') && 'file' || 'nofilter' }}
+          fail_level: warning
           level: ${{ (github.event_name == 'pull_request') && 'error' || 'warning' }}
           tool_name: ESLint
 
       - name: Prettier
+        if: ${{ !cancelled() && steps.install_dependencies.outcome == 'success' }}
         uses: EPMatt/reviewdog-action-prettier@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          reporter: github-pr-check
+          reporter: github-pr-annotations
           filter_mode: ${{ (github.event_name == 'pull_request') && 'file' || 'nofilter' }}
+          fail_level: warning
           level: ${{ (github.event_name == 'pull_request') && 'error' || 'warning' }}
           tool_name: Prettier
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index af86de84..30d74626 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Build Docker image (and push on main)
         uses: docker/build-push-action@v6
         with:
-          push: true
+          push: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha