diff --git a/CHANGES.md b/CHANGES.md
index 41e37f6836..ba36a67263 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@
 - Replace internal Gradle ConventionTask with DefaultTask [#1115](../../issues/1115) by @aSemy
 - Plugin Verifier cache directory now follows XDG cache standards [#1119](../../issues/1119) by @aSemy
 - Migrate most of the Gradle API in `IntelliJPlugin.kt` to use the Gradle Kotlin DSL extensions [#1117](../../issues/1117) by @aSemy
+- Support `runIde.jbrVersion` in `17.0.4.1-b653.1` format [#1172](../../issues/1172)
 
 ### Changed
 - Set minimum supported Gradle version from `6.7.1` to `6.8`
diff --git a/src/main/kotlin/org/jetbrains/intellij/jbr/JbrResolver.kt b/src/main/kotlin/org/jetbrains/intellij/jbr/JbrResolver.kt
index 7ce80bb92b..19576ad407 100644
--- a/src/main/kotlin/org/jetbrains/intellij/jbr/JbrResolver.kt
+++ b/src/main/kotlin/org/jetbrains/intellij/jbr/JbrResolver.kt
@@ -211,6 +211,7 @@ abstract class JbrResolver @Inject constructor(
                     false -> version.substring(lastIndexOfDash)
                 }
                 val buildNumberString = when (lastIndexOfB > -1) {
+                    lastIndexOfDash == lastIndexOfB -> version.substring(0, lastIndexOfDash - 1)
                     true -> version.substring(lastIndexOfB + 1)
                     else -> ""
                 }
@@ -244,7 +245,10 @@ abstract class JbrResolver @Inject constructor(
             }
 
             private fun getPrefix(version: String, variant: String?) = when {
-                !variant.isNullOrEmpty() -> "jbr_$variant-"
+                !variant.isNullOrEmpty() -> when(variant) {
+                    "sdk" -> "jbrsdk-"
+                    else -> "jbr_$variant-"
+                }
                 version.startsWith("jbrsdk-") -> "jbrsdk-"
                 version.startsWith("jbr_jcef-") -> "jbr_jcef-"
                 version.startsWith("jbr_dcevm-") -> "jbr_dcevm-"