diff --git a/.github/workflows/make.yaml b/.github/workflows/make.yaml
index 973b96592..0cc5196a9 100644
--- a/.github/workflows/make.yaml
+++ b/.github/workflows/make.yaml
@@ -274,15 +274,14 @@ jobs:
             exit 1
           fi
       - name: "Run golangci-lint"
+        run: golangci-lint run ./...
+      - name: "Annotate PR with golangci-lint findings"
+        if: failure() && github.event_name == 'pull_request'
         env:
           REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          if [ "${{ github.event_name }}" = "pull_request" ]; then
-            golangci-lint run --out-format=line-number ./... 2>&1 | \
-              reviewdog -f=golangci-lint -reporter=github-pr-review -filter-mode=nofilter -fail-level=error -name="golangci-lint"
-          else
-            golangci-lint run ./...
-          fi
+          golangci-lint run --out-format=line-number ./... 2>&1 | \
+            reviewdog -f=golangci-lint -reporter=github-pr-review -filter-mode=nofilter -name="golangci-lint" || true
 
   lint-js:
     name: "lint-js"
@@ -302,18 +301,16 @@ jobs:
       - name: "Generate Relay artifacts"
         run: make relay
       - name: "Run eslint"
+        run: npm run lint
+      - name: "Annotate PR with eslint findings"
+        if: failure() && github.event_name == 'pull_request'
         env:
           REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          if [ "${{ github.event_name }}" = "pull_request" ]; then
-            for dir in apps/console apps/trust packages/ui packages/eslint-config; do
-              (cd "$dir" && npx eslint . --concurrency 4 --format stylish 2>/dev/null) | \
-                reviewdog -f=eslint -reporter=github-pr-review -filter-mode=nofilter -fail-level=error -name="eslint ($dir)"
-            done
-            (cd packages/n8n-node && npx n8n-node lint)
-          else
-            npm run lint
-          fi
+          for dir in apps/console apps/trust packages/ui packages/eslint-config; do
+            (cd "$dir" && npx eslint . --concurrency 4 --format stylish 2>/dev/null) | \
+              reviewdog -f=eslint -reporter=github-pr-review -filter-mode=nofilter -name="eslint ($dir)" || true
+          done
 
   test:
     name: "test"
diff --git a/pkg/coredata/membership_profile.go b/pkg/coredata/membership_profile.go
index e478704a3..795fff3e2 100644
--- a/pkg/coredata/membership_profile.go
+++ b/pkg/coredata/membership_profile.go
@@ -1421,6 +1421,7 @@ WHERE
 				return ErrResourceInUse
 			}
 		}
+
 		return fmt.Errorf("cannot delete profile: %w", err)
 	}
 
diff --git a/pkg/server/api/mcp/v1/schema.resolvers.go b/pkg/server/api/mcp/v1/schema.resolvers.go
index 8b40607df..295bfb98c 100644
--- a/pkg/server/api/mcp/v1/schema.resolvers.go
+++ b/pkg/server/api/mcp/v1/schema.resolvers.go
@@ -2574,6 +2574,7 @@ func (r *Resolver) RemoveUserTool(ctx context.Context, req *mcp.CallToolRequest,
 		if _, ok := errors.AsType[*iam.ErrLastActiveOwner](err); ok {
 			return nil, types.RemoveUserOutput{}, fmt.Errorf("cannot remove last active owner: %w", err)
 		}
+
 		if errors.Is(err, coredata.ErrResourceInUse) {
 			return nil, types.RemoveUserOutput{}, fmt.Errorf("cannot remove user: %w", err)
 		}