diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a16f49d..876fcd31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,8 +14,8 @@
 
 ### Updated
 
+- `com.javiersc.hubdle:com.javiersc.hubdle.gradle.plugin -> 0.8.2`
 - `gradle -> 8.12.1`
-- `com.javiersc.hubdle:com.javiersc.hubdle.gradle.plugin -> 0.8.1`
 
 ## [0.8.0] - 2024-10-09
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ba6dba0b..37f07d68 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-hubdle = "0.8.1"
+hubdle = "0.8.2"
 
 [plugins]
 javiersc-hubdle = { id = "com.javiersc.hubdle", version.ref = "hubdle" }
diff --git a/semver-project-gradle-plugin/main/kotlin/com/javiersc/semver/project/gradle/plugin/internal/CalculatedVersion.kt b/semver-project-gradle-plugin/main/kotlin/com/javiersc/semver/project/gradle/plugin/internal/CalculatedVersion.kt
index b6a81553..72b96588 100644
--- a/semver-project-gradle-plugin/main/kotlin/com/javiersc/semver/project/gradle/plugin/internal/CalculatedVersion.kt
+++ b/semver-project-gradle-plugin/main/kotlin/com/javiersc/semver/project/gradle/plugin/internal/CalculatedVersion.kt
@@ -85,22 +85,22 @@ internal fun calculatedVersion(
             }
             stagePropertySanitized.equals(Stage.Final(), ignoreCase = true) -> {
                 when (scopeProperty) {
-                    Scope.Major() -> "${lastSemverInCurrentBranch.inc(Increase.Major, "")}"
-                    Scope.Minor() -> "${lastSemverInCurrentBranch.inc(Increase.Minor, "")}"
-                    Scope.Patch() -> "${lastSemverInCurrentBranch.inc(Increase.Patch, "")}"
+                    "${Scope.Major}" -> "${lastSemverInCurrentBranch.inc(Increase.Major, "")}"
+                    "${Scope.Minor}" -> "${lastSemverInCurrentBranch.inc(Increase.Minor, "")}"
+                    "${Scope.Patch}" -> "${lastSemverInCurrentBranch.inc(Increase.Patch, "")}"
                     else -> "${lastSemverInCurrentBranch.inc(stageName = "")}"
                 }
             }
-            scopeProperty == Scope.Major() -> {
+            scopeProperty == "${Scope.Major}" -> {
                 "${lastSemverInCurrentBranch.inc(Increase.Major, incStage)}"
             }
-            scopeProperty == Scope.Minor() -> {
+            scopeProperty == "${Scope.Minor}" -> {
                 "${lastSemverInCurrentBranch.inc(Increase.Minor, incStage)}"
             }
-            scopeProperty == Scope.Patch() -> {
+            scopeProperty == "${Scope.Patch}" -> {
                 "${lastSemverInCurrentBranch.inc(Increase.Patch, incStage)}"
             }
-            scopeProperty == Scope.Auto() -> {
+            scopeProperty == "${Scope.Auto}" -> {
                 when {
                     versionTagsInCurrentBranch.isEmpty() -> "$lastSemverInCurrentBranch"
                     incStage.isEmpty() ->
diff --git a/semver-project-gradle-plugin/main/kotlin/com/javiersc/semver/project/gradle/plugin/internal/Checkers.kt b/semver-project-gradle-plugin/main/kotlin/com/javiersc/semver/project/gradle/plugin/internal/Checkers.kt
index 1f86197e..1ae7b838 100644
--- a/semver-project-gradle-plugin/main/kotlin/com/javiersc/semver/project/gradle/plugin/internal/Checkers.kt
+++ b/semver-project-gradle-plugin/main/kotlin/com/javiersc/semver/project/gradle/plugin/internal/Checkers.kt
@@ -5,8 +5,8 @@ import org.gradle.api.Project
 
 internal fun Project.checkScopeCorrectness() {
     val scope = scopeProperty.orNull
-    check(scope in Scope.values().map(Scope::invoke) || scope.isNullOrBlank()) {
-        "`scope` value must be one of ${Scope.values().map(Scope::invoke)} or empty"
+    check(scope in Scope.entries.map(Scope::toString) || scope.isNullOrBlank()) {
+        "`scope` value must be one of ${Scope.entries.map(Scope::toString)} or empty"
     }
 }
 
diff --git a/semver-project-gradle-plugin/main/kotlin/com/javiersc/semver/project/gradle/plugin/internal/SemverProperty.kt b/semver-project-gradle-plugin/main/kotlin/com/javiersc/semver/project/gradle/plugin/internal/SemverProperty.kt
index a985d829..60b25c1b 100644
--- a/semver-project-gradle-plugin/main/kotlin/com/javiersc/semver/project/gradle/plugin/internal/SemverProperty.kt
+++ b/semver-project-gradle-plugin/main/kotlin/com/javiersc/semver/project/gradle/plugin/internal/SemverProperty.kt
@@ -63,7 +63,7 @@ internal enum class Scope(private val value: String) {
     Minor("minor"),
     Patch("patch");
 
-    operator fun invoke(): String = value
+    override fun toString(): String = value
 }
 
 private fun Project.getSemverProperty(semverProperty: SemverProperty): Provider<String> =