diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..3e136c6c79
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "commons-dao"]
+	path = commons-dao
+	url = https://github.com/reportportal/commons-dao.git
+	branch = develop
+[submodule "commons"]
+	path = commons
+	url = https://github.com/reportportal/commons.git
+	branch = develop
+[submodule "plugin-api"]
+	path = plugin-api
+	url = https://github.com/reportportal/plugin-api.git
+	branch = develop
diff --git a/build.gradle b/build.gradle
index 291ee43c45..acc5772d6e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,10 +15,10 @@
  */
 
 plugins {
-    id "io.spring.dependency-management" version "1.1.4"
+    id "io.spring.dependency-management" version "1.1.6"
     id 'org.springframework.boot' version '2.5.15'
     id 'java'
-    id "org.owasp.dependencycheck" version "9.0.9"
+    id "org.owasp.dependencycheck" version "11.1.0"
     id "com.epam.drill.integration.cicd" version "0.1.6"
 }
 
@@ -41,6 +41,7 @@ project.hasProperty('sealightsSession') && sealightsSession?.trim() ? apply(from
 repositories {
     mavenCentral { url "https://repo1.maven.org/maven2" }
 
+    // We have to use jitpack for building commons libraries
     if (!releaseMode) {
         maven { url 'https://jitpack.io' }
     }
@@ -67,15 +68,9 @@ dependencyManagement {
 }
 
 dependencies {
-    if (releaseMode) {
-        implementation 'com.epam.reportportal:commons-dao'
-        implementation 'com.epam.reportportal:commons'
-        implementation 'com.epam.reportportal:plugin-api'
-    } else {
-        implementation 'com.github.reportportal:commons-dao:72f99ff'
-        implementation 'com.github.reportportal:commons:26ab837'
-        implementation 'com.github.reportportal:plugin-api:8a1f61c'
-    }
+    implementation project(':commons')
+    implementation project(':commons-dao')
+    implementation project(':plugin-api')
 
     implementation 'org.springframework.boot:spring-boot-starter-aop'
     implementation 'org.springframework.boot:spring-boot-starter-web'
@@ -194,6 +189,7 @@ dependencyCheck {
 }
 
 bootJar {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     project.hasProperty('gcp') ? getArchiveFileName().set('app.jar') : archiveClassifier.set('' +
             'exec')
 }
@@ -234,6 +230,16 @@ drill {
     }
 }
 
+tasks.register('initGitSubmodules') {
+    doLast {
+        exec {
+            commandLine 'git', 'submodule', 'update', '--init'
+        }
+    }
+}
+
+compileJava.dependsOn initGitSubmodules
+
 tasks.preTagCommit.enabled = false
 tasks.updateVersion.enabled = false
 tasks.commitNewVersion.enabled = false
diff --git a/commons b/commons
new file mode 160000
index 0000000000..5708d401e6
--- /dev/null
+++ b/commons
@@ -0,0 +1 @@
+Subproject commit 5708d401e64e20172ff7521d2df49bdde3d28ff2
diff --git a/commons-dao b/commons-dao
new file mode 160000
index 0000000000..49a5cffb39
--- /dev/null
+++ b/commons-dao
@@ -0,0 +1 @@
+Subproject commit 49a5cffb391192c6c5a816522afd3b8f530ad588
diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties
new file mode 100644
index 0000000000..63e5bbdf48
--- /dev/null
+++ b/gradle/gradle-daemon-jvm.properties
@@ -0,0 +1,2 @@
+#This file is generated by updateDaemonJvm
+toolchainVersion=21
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e0930b..9355b41557 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/plugin-api b/plugin-api
new file mode 160000
index 0000000000..ed20181d4e
--- /dev/null
+++ b/plugin-api
@@ -0,0 +1 @@
+Subproject commit ed20181d4e987fb52cf1bb480e042f1ae3dd7dc9
diff --git a/project-properties.gradle b/project-properties.gradle
index e2855f4db0..66985ccc4e 100755
--- a/project-properties.gradle
+++ b/project-properties.gradle
@@ -12,6 +12,7 @@ project.ext {
             'method'     : 65,
             'class'      : 90
     ]
+    scriptVersion =
     isDebugMode = System.getProperty("DEBUG", "false") == "true"
     releaseMode = project.hasProperty("releaseMode")
     scriptsUrl = commonScriptsUrl + (releaseMode ? '5.12.0' : 'develop')
diff --git a/settings.gradle b/settings.gradle
index 3178aa6638..92a88b449a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,5 @@
 rootProject.name = 'service-api'
+
+include('commons')
+include('commons-dao')
+include('plugin-api')
\ No newline at end of file