diff --git a/.gitmodules b/.gitmodules
index 73aed1c5..44de577c 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 = petertrr/fix-spotless-config
diff --git a/README.md b/README.md
index d062dee1..584517bd 100644
--- a/README.md
+++ b/README.md
@@ -49,13 +49,7 @@ You can also build and run only Ruling Tests:
 
 ## License headers
 
-License headers are automatically updated by the spotless plugin but only for Java files. 
-Furthermore, there are files such as `package-info.java` and `module-info.java` that spotless ignores. 
-Also the Go source files are not handled. For those files use a manual script like below to update the license:
-
-```shell
-`find . -type f -name "*.go" -exec sed -i '' 's/2018-2023/2018-2024/' "{}" \;`
-```
+License headers are automatically updated by the spotless plugin.
 
 ## License
 
diff --git a/build-logic b/build-logic
index a2bbe6c8..afa08d7e 160000
--- a/build-logic
+++ b/build-logic
@@ -1 +1 @@
-Subproject commit a2bbe6c8d29755b7d6d147dc4fff391a76177ad6
+Subproject commit afa08d7e0d79c177ffc85db00115906a78a2dd53
diff --git a/build.gradle b/build.gradle
index 031e14c9..3ac01e2a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,7 @@
 import java.util.jar.JarInputStream
 
 plugins {
+    id("org.sonarsource.cloud-native.code-style-conventions")
     id 'com.jfrog.artifactory' version '4.28.2'
     id 'org.sonarqube' version '6.0.1.5171'
     id 'de.thetaphi.forbiddenapis' version '3.0' apply false
@@ -28,7 +29,7 @@ allprojects {
     }
 
     repositories {
-        mavenLocal()
+        mavenCentral()
         def artifactoryBearerToken = System.getenv("ARTIFACTORY_PRIVATE_PASSWORD") ?: project.findProperty("artifactoryPassword")
         if (artifactoryBearerToken) {
             maven {
@@ -42,7 +43,6 @@ allprojects {
                 }
             }
         }
-        mavenCentral()
     }
 }
 
diff --git a/its/plugin/build.gradle.kts b/its/plugin/build.gradle.kts
index 09cb8870..e07b810d 100644
--- a/its/plugin/build.gradle.kts
+++ b/its/plugin/build.gradle.kts
@@ -1,3 +1,19 @@
+/*
+ * SonarSource Go
+ * Copyright (C) 2018-2024 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the Sonar Source-Available License Version 1, as published by SonarSource SA.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the Sonar Source-Available License for more details.
+ *
+ * You should have received a copy of the Sonar Source-Available License
+ * along with this program; if not, see https://sonarsource.com/license/ssal/
+ */
 plugins {
     id("org.sonarsource.cloud-native.java-conventions")
     id("org.sonarsource.cloud-native.code-style-conventions")
diff --git a/its/ruling/build.gradle.kts b/its/ruling/build.gradle.kts
index 956e807b..44d39569 100644
--- a/its/ruling/build.gradle.kts
+++ b/its/ruling/build.gradle.kts
@@ -1,3 +1,19 @@
+/*
+ * SonarSource Go
+ * Copyright (C) 2018-2024 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the Sonar Source-Available License Version 1, as published by SonarSource SA.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the Sonar Source-Available License for more details.
+ *
+ * You should have received a copy of the Sonar Source-Available License
+ * along with this program; if not, see https://sonarsource.com/license/ssal/
+ */
 plugins {
     id("org.sonarsource.cloud-native.java-conventions")
     id("org.sonarsource.cloud-native.code-style-conventions")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 423fd47c..7874dae9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,3 +1,19 @@
+/*
+ * SonarSource Go
+ * Copyright (C) 2018-2024 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the Sonar Source-Available License Version 1, as published by SonarSource SA.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the Sonar Source-Available License for more details.
+ *
+ * You should have received a copy of the Sonar Source-Available License
+ * along with this program; if not, see https://sonarsource.com/license/ssal/
+ */
 pluginManagement {
     includeBuild("build-logic")
     repositories {
diff --git a/sonar-go-plugin/build.gradle.kts b/sonar-go-plugin/build.gradle.kts
index 0cabf12a..1b00ad0a 100644
--- a/sonar-go-plugin/build.gradle.kts
+++ b/sonar-go-plugin/build.gradle.kts
@@ -1,3 +1,19 @@
+/*
+ * SonarSource Go
+ * Copyright (C) 2018-2024 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the Sonar Source-Available License Version 1, as published by SonarSource SA.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the Sonar Source-Available License for more details.
+ *
+ * You should have received a copy of the Sonar Source-Available License
+ * along with this program; if not, see https://sonarsource.com/license/ssal/
+ */
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.HashSet
diff --git a/sonar-go-to-slang/build.gradle.kts b/sonar-go-to-slang/build.gradle.kts
index f02c4a45..503354bf 100644
--- a/sonar-go-to-slang/build.gradle.kts
+++ b/sonar-go-to-slang/build.gradle.kts
@@ -1,3 +1,19 @@
+/*
+ * SonarSource Go
+ * Copyright (C) 2018-2024 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the Sonar Source-Available License Version 1, as published by SonarSource SA.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the Sonar Source-Available License for more details.
+ *
+ * You should have received a copy of the Sonar Source-Available License
+ * along with this program; if not, see https://sonarsource.com/license/ssal/
+ */
 plugins {
     id("org.sonarsource.cloud-native.code-style-conventions")
 }