diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ab6a6f6..7047710 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,8 +1,9 @@
 name: IntelliJ Plugin Build
 on:
+  pull_request:
   push:
     branches:
-      - '**'
+      - main
 
 permissions:
   contents: read
@@ -12,12 +13,17 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container:
-      image: gradle:jdk23-corretto
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Prepare environment
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          cache: 'gradle'
+          distribution: 'temurin'
+
       # required since test report action uses git
       - name: Configure Git Safe Directory
         run: |
@@ -49,3 +55,17 @@ jobs:
 
       - name: Build plugin
         run: ./gradlew buildPlugin
+
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2024.3
+        with:
+          pr-mode: false
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN_1103458822 }}
+          QODANA_ENDPOINT: 'https://qodana.cloud'
+
+      - name: Upload plugin artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: context-mapper-intellij-plugin
+          path: ./build/distributions/context-mapper-intellij-plugin.zip
diff --git a/.github/workflows/qodana_code_quality.yml b/.github/workflows/qodana_code_quality.yml
deleted file mode 100644
index f183af6..0000000
--- a/.github/workflows/qodana_code_quality.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Qodana
-on:
-  workflow_dispatch:
-  pull_request:
-  push:
-    branches: # Specify your branches here
-      - main # The 'main' branch
-      - 'releases/*' # The release branches
-
-jobs:
-  qodana:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-      checks: write
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
-          fetch-depth: 0  # a full history is required for pull request analysis
-      - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2024.3
-        with:
-          pr-mode: false
-        env:
-          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN_1103458822 }}
-          QODANA_ENDPOINT: 'https://qodana.cloud'
\ No newline at end of file
diff --git a/lsp/package.json b/lsp/package.json
index f6944f6..da51d07 100644
--- a/lsp/package.json
+++ b/lsp/package.json
@@ -2,6 +2,6 @@
   "name": "context-mapper-intellij-plugin",
   "private": true,
   "dependencies": {
-    "@lstreckeisen/context-mapper-language-server": "0.1.0"
+    "@lstreckeisen/context-mapper-language-server": "0.2.0"
   }
 }
\ No newline at end of file
diff --git a/qodana.yaml b/qodana.yaml
index 9980859..feb88c8 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -1,5 +1,5 @@
 version: "1.0"
-linter: jetbrains/qodana-jvm-community:2024.3
+linter: jetbrains/qodana-jvm:2024.3
 profile:
   name: qodana.recommended
 include: