diff --git a/.github/template-cleanup/settings.gradle.kts b/.github/template-cleanup/settings.gradle.kts
index a223046..06653a4 100644
--- a/.github/template-cleanup/settings.gradle.kts
+++ b/.github/template-cleanup/settings.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
 rootProject.name = "%NAME%"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9221a58..09371e5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -239,13 +239,6 @@ jobs:
       - name: Fetch Sources
         uses: actions/checkout@v4
 
-      # Set up Java environment for the next steps
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: zulu
-          java-version: 17
-
       # Remove old release drafts by using the curl request for the available releases with a draft flag
       - name: Remove Old Release Drafts
         env:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 273c325..9cb89f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,18 @@
 
 ## [Unreleased]
 
+### Changed
+
+- Gradle - upgrade `org.gradle.toolchains.foojay-resolver-convention` to `0.8.0`
+
+### Fixed
+
+- Fixed calculation of the plugin publication channel
+
+### Removed
+
+- GitHub Actions: Remove the `Setup Java` step from the `releaseDraft` build step
+
 ## [1.12.0] - 2024-02-20
 
 ### Added
diff --git a/build.gradle.kts b/build.gradle.kts
index 7b867e7..c5e5958 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.substringAfter('-').substringBefore('.').ifEmpty { "default" }) }
+        channels = properties("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) }
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 897361b..e633135 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
 rootProject.name = "IntelliJ Platform Plugin Template"