diff --git a/.github/workflows/qodana_code_quality.yml b/.github/workflows/qodana_code_quality.yml
index 2ba7a88..fbc9405 100644
--- a/.github/workflows/qodana_code_quality.yml
+++ b/.github/workflows/qodana_code_quality.yml
@@ -50,8 +50,8 @@ jobs:
         with:
           # Enable PR-specific reporting only for pull_request events
           pr-mode: ${{ github.event_name == 'pull_request' }}
-          # Explicitly set the linter image to match qodana.yaml and silence warnings
-          image: jetbrains/qodana-jvm:2025.2
+          # Pass the linter image via args (the action does not support an `image` input)
+          args: --image jetbrains/qodana-jvm:2025.2
         env:
           QODANA_TOKEN: ${{ secrets.QODANA_TOKEN_268690425 }}
           QODANA_ENDPOINT: 'https://qodana.cloud'
diff --git a/qodana.yaml b/qodana.yaml
index c71ee92..2b114b3 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -8,18 +8,17 @@ profile:
   name: qodana.recommended
 bootstrap: |
   # Generate sources (including protobuf) so Qodana resolves imports correctly
-  # Prefer Maven Wrapper if present; fall back to system mvn
+  # Prefer Maven Wrapper if present; fall back to system mvn (POSIX sh compatible)
   # Ensure mvnw is executable if present
   if [ -f ./mvnw ]; then chmod +x ./mvnw || true; fi
   if [ -x ./mvnw ]; then
     ./mvnw -B -q -DskipTests -DskipITs=true generate-sources || true
   elif [ -f ./mvnw ]; then
     sh ./mvnw -B -q -DskipTests -DskipITs=true generate-sources || true
+  elif command -v mvn >/dev/null 2>&1; then
+    mvn -B -q -DskipTests -DskipITs=true generate-sources || true
   else
-    echo "[Qodana bootstrap] mvnw not found, trying system mvn"
-    mvn -B -q -DskipTests -DskipITs=true generate-sources || {
-      echo "[Qodana bootstrap] mvn not available; skipping source generation";
-    }
+    echo "[Qodana bootstrap] Maven not available; skipping source generation"
   fi
 include:
   - name: CheckDependencyLicenses