diff --git a/build.gradle.kts b/build.gradle.kts
index 3c6d6a4..4a33812 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,7 @@
 import com.jetbrains.plugin.structure.base.utils.isFile
 import org.jetbrains.changelog.markdownToHTML
 import org.jetbrains.intellij.platform.gradle.Constants
+import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import kotlin.io.path.absolute
 import kotlin.io.path.isDirectory
 
@@ -69,11 +70,15 @@ sourceSets {
 }
 
 tasks.compileKotlin {
-    kotlinOptions { jvmTarget = "21" }
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
+    }
 }
 
 tasks.compileTestKotlin {
-    kotlinOptions { jvmTarget = "21" }
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
+    }
 }
 
 tasks.test {
@@ -178,7 +183,7 @@ dependencies {
 intellijPlatform {
     pluginVerification {
         ides {
-            recommended()
+            create(IntelliJPlatformType.Rider, ProductVersion)
         }
     }
 
diff --git a/gradle.properties b/gradle.properties
index 46c081f..8d5293a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,7 +7,7 @@ RiderPluginId=com.jetbrains.rider.plugins.dotnetdisassembler
 PluginRepositoryUrl=https://github.com/JetBrains/dotnet-disassembler-plugin
 PluginVersion=0.1.1
 
-pluginSinceBuild=253
+pluginSinceBuild=261
 
 BuildConfiguration=Debug
 
@@ -18,10 +18,10 @@ BuildConfiguration=Debug
 #   Release:  2020.2
 #   EAP:      2020.3-EAP2-SNAPSHOT
 #   Nightly:  2020.3-SNAPSHOT
-ProductVersion=2025.3
+ProductVersion=2026.1-SNAPSHOT
 
 # Plugin Verification IDE Version
-pluginVerificationIdeVersion=2025.3
+pluginVerificationIdeVersion=2026.1-SNAPSHOT
 
 # Kotlin 1.4 will bundle the stdlib dependency by default, causing problems with the version bundled with the IDE
 # https://blog.jetbrains.com/kotlin/2020/07/kotlin-1-4-rc-released/#stdlib-default
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 44aa6b7..c21a89a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.1.20" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
+kotlin = "2.3.0" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
 rdGen = "2025.3.1" # https://github.com/JetBrains/rd/releases
 changelog = "2.5.0" # https://github.com/JetBrains/gradle-changelog-plugin/releases
 
diff --git a/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasmAdapters/JitDisasmProjectContextFactory.cs b/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasmAdapters/JitDisasmProjectContextFactory.cs
index 0a72732..385b6a1 100644
--- a/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasmAdapters/JitDisasmProjectContextFactory.cs
+++ b/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasmAdapters/JitDisasmProjectContextFactory.cs
@@ -36,6 +36,6 @@ private static string GetDotNetCliExePath(ISolution solution)
         var protocolSolution = solution.GetProtocolSolution();
         var runtimeModel = protocolSolution.GetDotNetActiveRuntimeModel();
         var activeRuntime = runtimeModel.ActiveRuntime.Maybe.ValueOrDefault;
-        return activeRuntime?.DotNetCliExePath;
+        return activeRuntime?.DotNetCliExePath?.Value ?? "dotnet";
     }
 }