diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6e21b5a..57a4862 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -256,7 +256,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh release create v${{ needs.build.outputs.version }} \
+          gh release create "v${{ needs.build.outputs.version }}" \
             --draft \
             --title "v${{ needs.build.outputs.version }}" \
             --notes "$(cat << 'EOM'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41cbf7e..ee2b30c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- Adjusted obtaining the value for `publishPlugin.channels` property in `build.gradle.kts`
+- Fixed bash variable access in the Create Release Draft step.
+
 ### Removed
 
 - Remove Gradle Kotlin DSL Lazy Property Assignment because it's default now
diff --git a/build.gradle.kts b/build.gradle.kts
index bf0c939..7b867e7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -126,6 +126,6 @@ tasks {
         // The pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
         // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
         // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
-        channels = properties("pluginVersion").map { listOf(it.split('-').getOrElse(1) { "default" }.split('.').first()) }
+        channels = properties("pluginVersion").map { listOf(it.substringAfter('-').substringBefore('.').ifEmpty { "default" }) }
     }
 }