diff --git a/.gitmodules b/.gitmodules
index 73aed1c..23a706c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,4 @@
 [submodule "build-logic"]
 	path = build-logic
 	url = https://github.com/SonarSource/cloud-native-gradle-modules
+	branch = SONARGO-83
diff --git a/build-logic b/build-logic
index a2bbe6c..99fe1da 160000
--- a/build-logic
+++ b/build-logic
@@ -1 +1 @@
-Subproject commit a2bbe6c8d29755b7d6d147dc4fff391a76177ad6
+Subproject commit 99fe1da93bbdab11232596ead3753053e44f2165
diff --git a/build.gradle b/build.gradle
index 031e14c..34e142d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,19 +13,12 @@ allprojects {
     apply plugin: 'signing'
 
     ext {
-        buildNumber = System.getProperty("buildNumber")
-
         sonarLinksCi = 'https://cirrus-ci.com/github/SonarSource/sonar-go'
         sonarLinksScm = 'https://github.com/SonarSource/sonar-go'
 
         artifactsToPublish = ''
         artifactsToDownload = ''
     }
-    // Replaces the version defined in sources, usually x.y-SNAPSHOT, by a version identifying the build.
-    if (version.endsWith('-SNAPSHOT') && ext.buildNumber != null) {
-        def versionSuffix = (version.toString().count('.') == 1 ? ".0.${ext.buildNumber}" : ".${ext.buildNumber}")
-        version = version.replace('-SNAPSHOT', versionSuffix)
-    }
 
     repositories {
         mavenLocal()
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 423fd47..852c7e5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,42 +1,9 @@
 pluginManagement {
     includeBuild("build-logic")
-    repositories {
-        mavenCentral()
-        gradlePluginPortal()
-    }
 }
 
 plugins {
-    id("com.gradle.develocity") version "3.18.2"
-    id("com.diffplug.blowdryerSetup") version "1.7.1"
-}
-
-develocity {
-    server = "https://develocity.sonar.build"
-    buildScan {
-        tag(if (System.getenv("CI").isNullOrEmpty()) "local" else "CI")
-        tag(System.getProperty("os.name"))
-        if (System.getenv("CIRRUS_BRANCH") == "master") {
-            tag("master")
-        }
-        if (System.getenv("CIRRUS_PR")?.isBlank() == false) {
-            tag("PR")
-        }
-        value("Build Number", System.getenv("BUILD_NUMBER"))
-        value("Branch", System.getenv("CIRRUS_BRANCH"))
-        value("PR", System.getenv("CIRRUS_PR"))
-    }
-}
-
-val isCI = System.getenv("CI") != null
-buildCache {
-    local {
-        isEnabled = !isCI
-    }
-    remote(develocity.buildCache) {
-        isEnabled = true
-        isPush = isCI
-    }
+    id("org.sonarsource.cloud-native.common-settings")
 }
 
 rootProject.name = "sonar-go"