diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 68d7aa10..74470cc4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
           - { jdk: 21, idea: 2025.2 }
           - { jdk: 21, idea: 2025.3 }
           - { jdk: 21, idea: 2026.1 }
-          - { jdk: 21, idea: LATEST-EAP-SNAPSHOT }
+          - { jdk: 25, idea: LATEST-EAP-SNAPSHOT }
     name: 'IDEA ${{ matrix.version.idea }}'
     env:
       IDEA_VERSION: ${{ matrix.version.idea }}
diff --git a/build.gradle b/build.gradle
index 6c8f86ad..e13941e4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 
 plugins {
     id('java')
-    id("org.jetbrains.intellij.platform") version "2.15.0"
+    id("org.jetbrains.intellij.platform") version "2.19.0"
     id("com.github.hierynomus.license") version "0.16.1"
 }
 
@@ -20,6 +20,9 @@ apply plugin: 'checkstyle'
 apply plugin: 'jacoco'
 
 java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(Runtime.version().feature())
+    }
     sourceCompatibility = JavaLanguageVersion.of(21)
     targetCompatibility = JavaLanguageVersion.of(21)
 }
diff --git a/src/main/java/org/mapstruct/intellij/codeinsight/completion/ComponentModelCompletionContributor.java b/src/main/java/org/mapstruct/intellij/codeinsight/completion/ComponentModelCompletionContributor.java
index 937af168..0746257a 100644
--- a/src/main/java/org/mapstruct/intellij/codeinsight/completion/ComponentModelCompletionContributor.java
+++ b/src/main/java/org/mapstruct/intellij/codeinsight/completion/ComponentModelCompletionContributor.java
@@ -60,6 +60,7 @@ protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull
                     result.addElement( LookupElementBuilder.create( type ) );
                 }
             }
+            result.stopHere();
         }
 
     }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index b111da73..a368fcbb 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -37,7 +37,7 @@
   <extensions defaultExtensionNs="com.intellij">
     <!-- Add your extensions here -->
 
-    <completion.contributor language="JAVA" implementationClass="org.mapstruct.intellij.codeinsight.completion.ComponentModelCompletionContributor" />
+    <completion.contributor language="JAVA" order="first" implementationClass="org.mapstruct.intellij.codeinsight.completion.ComponentModelCompletionContributor" />
     <psi.referenceContributor language="JAVA" implementation="org.mapstruct.intellij.codeinsight.references.MapstructReferenceContributor" />
     <methodReferencesSearch implementation="org.mapstruct.intellij.search.MappingMethodUsagesSearcher" />
     <renameHandler implementation="org.mapstruct.intellij.rename.MapstructSourceTargetParameterRenameHandler"/>
diff --git a/src/test/java/org/mapstruct/intellij/BaseComponentModelCompletionTest.java b/src/test/java/org/mapstruct/intellij/BaseComponentModelCompletionTest.java
index a2214194..ea6fba8b 100644
--- a/src/test/java/org/mapstruct/intellij/BaseComponentModelCompletionTest.java
+++ b/src/test/java/org/mapstruct/intellij/BaseComponentModelCompletionTest.java
@@ -24,10 +24,9 @@ public void testCompletionInsideQuotes() {
 
     public void testCompletionInsideQuotesStartsWithC() {
         configureByTestName();
-        List<String> strings = myFixture.getLookupElementStrings();
-        assertThat( strings ).as( "Inside quotes" )
-            .contains( "cdi" )
-            .doesNotContain( "default", "spring", "jsr330" );
+        assertThat( myFixture.getFile().getText() )
+            .as( "Single matching component model is inserted automatically" )
+            .contains( "componentModel = \"cdi\"" );
     }
 
     public void testCompletionNoQuotes() {