diff --git a/build.gradle b/build.gradle
index 2c03002..222bd54 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,13 +5,13 @@ plugins {
 }
 
 project.ext {
-    releaseMode = project.hasProperty("releaseMode")
+    releaseMode = project.hasProperty("releaseMode") ? project.releaseMode.toBoolean() : false
     publishRepo = "https://maven.pkg.github.com/reportportal/plugin-api"
     dependencyRepos = ["commons-model", "commons-rules", "commons-dao", "commons-bom"]
+    scriptVersion = project.hasProperty("scripts.version") ? project.scripts.version : "develop"
 }
 
-def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/' +
-        (releaseMode ? getProperty('scripts.version') : 'develop')
+def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/' + scriptVersion
 
 apply from: scriptsUrl + '/release-commons.gradle'
 apply from: scriptsUrl + '/signing.gradle'
@@ -42,7 +42,7 @@ dependencies {
         api 'com.epam.reportportal:commons'
     } else {
         implementation 'com.github.reportportal:commons-dao:adbb40e'
-        api 'com.github.reportportal:commons:6e23763'
+        api 'com.github.reportportal:commons:3dfb9d8'
     }
     api 'org.pf4j:pf4j:3.10.0'
     api 'org.pf4j:pf4j-update:2.3.0'
@@ -50,7 +50,6 @@ dependencies {
     testImplementation 'junit:junit'
 }
 
-
-wrapper {
-    gradleVersion = '8.10'
-}
+//wrapper {
+//    gradleVersion = '8.10'
+//}