diff --git a/build.gradle.kts b/build.gradle.kts
index f108f6f..6b20563 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     `kotlin-dsl`
     id("signing")
@@ -112,35 +97,17 @@ if (publishSigningEnabled) {
 }
 
 spotless {
-    val header =
-        """
-           /*
-            * Copyright (C) ${'$'}YEAR Hiero a Series of LF Projects, LLC
-            *
-            * Licensed under the Apache License, Version 2.0 (the "License");
-            * you may not use this file except in compliance with the License.
-            * You may obtain a copy of the License at
-            *
-            *      http://www.apache.org/licenses/LICENSE-2.0
-            *
-            * Unless required by applicable law or agreed to in writing, software
-            * distributed under the License is distributed on an "AS IS" BASIS,
-            * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-            * See the License for the specific language governing permissions and
-            * limitations under the License.
-            */${"\n\n"}
-        """
-            .trimIndent()
-    val top =
+    val header = "// SPDX-License-Identifier: Apache-2.0\n"
+    val delimiter =
         "(import|package|plugins|pluginManagement|dependencyResolutionManagement|repositories|tasks|allprojects|subprojects|buildCache|version)"
 
     kotlinGradle {
         ktfmt().kotlinlangStyle()
-        licenseHeader(header, top).updateYearWithLatest(true)
+        licenseHeader(header, delimiter)
     }
     kotlin {
         ktfmt().kotlinlangStyle()
         targetExclude("build/**")
-        licenseHeader(header, top).updateYearWithLatest(true)
+        licenseHeader(header, delimiter)
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f36dfa7..6014ecc 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins { id("com.gradle.develocity") version "3.18.2" }
 
 rootProject.name = "hiero-gradle-conventions"
diff --git a/src/main/kotlin/org.hiero.gradle.base.jpms-modules.gradle.kts b/src/main/kotlin/org.hiero.gradle.base.jpms-modules.gradle.kts
index 0dae400..b441c18 100644
--- a/src/main/kotlin/org.hiero.gradle.base.jpms-modules.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.base.jpms-modules.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2016-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("org.gradlex.jvm-dependency-conflict-resolution")
     id("org.gradlex.extra-java-module-info")
diff --git a/src/main/kotlin/org.hiero.gradle.base.lifecycle.gradle.kts b/src/main/kotlin/org.hiero.gradle.base.lifecycle.gradle.kts
index 0e75ece..0923d49 100644
--- a/src/main/kotlin/org.hiero.gradle.base.lifecycle.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.base.lifecycle.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2016-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins { id("base") }
 
 // Convenience for local development: when running './gradlew' without any parameters show the tasks
diff --git a/src/main/kotlin/org.hiero.gradle.base.version.gradle.kts b/src/main/kotlin/org.hiero.gradle.base.version.gradle.kts
index 72c8368..024cca3 100644
--- a/src/main/kotlin/org.hiero.gradle.base.version.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.base.version.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2016-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 version =
     providers
         .fileContents(isolated.rootProject.projectDirectory.file("version.txt"))
diff --git a/src/main/kotlin/org.hiero.gradle.build.settings.gradle.kts b/src/main/kotlin/org.hiero.gradle.build.settings.gradle.kts
index d338299..58c2687 100644
--- a/src/main/kotlin/org.hiero.gradle.build.settings.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.build.settings.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 import org.gradlex.javamodule.dependencies.initialization.JavaModulesExtension
 import org.gradlex.javamodule.dependencies.initialization.RootPluginsExtension
 
diff --git a/src/main/kotlin/org.hiero.gradle.check.dependencies.gradle.kts b/src/main/kotlin/org.hiero.gradle.check.dependencies.gradle.kts
index 7037312..5d73d9d 100644
--- a/src/main/kotlin/org.hiero.gradle.check.dependencies.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.check.dependencies.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 import com.autonomousapps.DependencyAnalysisExtension
 import com.autonomousapps.DependencyAnalysisSubExtension
 import org.gradlex.javamodule.dependencies.tasks.ModuleDirectivesOrderingCheck
diff --git a/src/main/kotlin/org.hiero.gradle.check.javac-lint.gradle.kts b/src/main/kotlin/org.hiero.gradle.check.javac-lint.gradle.kts
index 7f9c3e1..bc4e891 100644
--- a/src/main/kotlin/org.hiero.gradle.check.javac-lint.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.check.javac-lint.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins { id("java") }
 
 val deactivatedCompileLintOptions =
diff --git a/src/main/kotlin/org.hiero.gradle.check.spotless-java.gradle.kts b/src/main/kotlin/org.hiero.gradle.check.spotless-java.gradle.kts
index 8ba5fb4..42cbf3f 100644
--- a/src/main/kotlin/org.hiero.gradle.check.spotless-java.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.check.spotless-java.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 import org.hiero.gradle.spotless.RepairDashedCommentsFormatterStep
 import org.hiero.gradle.spotless.SortModuleInfoRequiresStep
 
@@ -37,27 +22,6 @@ spotless {
         // through git history (see "license" section below).
         // The delimiter override below is required to support some
         // of our test classes which are in the default package.
-        licenseHeader(
-                """
-           /*
-            * Copyright (C) ${'$'}YEAR Hedera Hashgraph, LLC
-            *
-            * Licensed under the Apache License, Version 2.0 (the "License");
-            * you may not use this file except in compliance with the License.
-            * You may obtain a copy of the License at
-            *
-            *      http://www.apache.org/licenses/LICENSE-2.0
-            *
-            * Unless required by applicable law or agreed to in writing, software
-            * distributed under the License is distributed on an "AS IS" BASIS,
-            * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-            * See the License for the specific language governing permissions and
-            * limitations under the License.
-            */${"\n\n"}
-        """
-                    .trimIndent(),
-                "(package|import|module)"
-            )
-            .updateYearWithLatest(true)
+        licenseHeader("// SPDX-License-Identifier: Apache-2.0\n", "(package|import|module)")
     }
 }
diff --git a/src/main/kotlin/org.hiero.gradle.check.spotless-kotlin.gradle.kts b/src/main/kotlin/org.hiero.gradle.check.spotless-kotlin.gradle.kts
index 16ef258..600baf9 100644
--- a/src/main/kotlin/org.hiero.gradle.check.spotless-kotlin.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.check.spotless-kotlin.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins { id("com.diffplug.spotless") }
 
 spotless {
@@ -21,26 +6,8 @@ spotless {
         ktfmt().kotlinlangStyle()
 
         licenseHeader(
-                """
-           /*
-            * Copyright (C) ${'$'}YEAR Hedera Hashgraph, LLC
-            *
-            * Licensed under the Apache License, Version 2.0 (the "License");
-            * you may not use this file except in compliance with the License.
-            * You may obtain a copy of the License at
-            *
-            *      http://www.apache.org/licenses/LICENSE-2.0
-            *
-            * Unless required by applicable law or agreed to in writing, software
-            * distributed under the License is distributed on an "AS IS" BASIS,
-            * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-            * See the License for the specific language governing permissions and
-            * limitations under the License.
-            */${"\n\n"}
-        """
-                    .trimIndent(),
-                "(import|plugins|pluginManagement|dependencyResolutionManagement|repositories|tasks|allprojects|subprojects|buildCache|version)"
-            )
-            .updateYearWithLatest(true)
+            "// SPDX-License-Identifier: Apache-2.0\n",
+            "(import|plugins|pluginManagement|dependencyResolutionManagement|repositories|tasks|allprojects|subprojects|buildCache|version)"
+        )
     }
 }
diff --git a/src/main/kotlin/org.hiero.gradle.check.spotless-markdown.gradle.kts b/src/main/kotlin/org.hiero.gradle.check.spotless-markdown.gradle.kts
index 9537e30..667f580 100644
--- a/src/main/kotlin/org.hiero.gradle.check.spotless-markdown.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.check.spotless-markdown.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins { id("com.diffplug.spotless") }
 
 spotless {
diff --git a/src/main/kotlin/org.hiero.gradle.check.spotless-misc.gradle.kts b/src/main/kotlin/org.hiero.gradle.check.spotless-misc.gradle.kts
index b9d7244..7346d4c 100644
--- a/src/main/kotlin/org.hiero.gradle.check.spotless-misc.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.check.spotless-misc.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins { id("com.diffplug.spotless") }
 
 spotless {
diff --git a/src/main/kotlin/org.hiero.gradle.check.spotless-yaml.gradle.kts b/src/main/kotlin/org.hiero.gradle.check.spotless-yaml.gradle.kts
index c1d0367..887dc22 100644
--- a/src/main/kotlin/org.hiero.gradle.check.spotless-yaml.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.check.spotless-yaml.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins { id("com.diffplug.spotless") }
 
 spotless {
@@ -33,27 +18,6 @@ spotless {
         indentWithSpaces()
         endWithNewline()
 
-        licenseHeader(
-                """
-            ##
-            # Copyright (C) ${'$'}YEAR Hedera Hashgraph, LLC
-            #
-            # Licensed under the Apache License, Version 2.0 (the "License");
-            # you may not use this file except in compliance with the License.
-            # You may obtain a copy of the License at
-            #
-            #      http://www.apache.org/licenses/LICENSE-2.0
-            #
-            # Unless required by applicable law or agreed to in writing, software
-            # distributed under the License is distributed on an "AS IS" BASIS,
-            # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-            # See the License for the specific language governing permissions and
-            # limitations under the License.
-            ##${"\n\n"}
-        """
-                    .trimIndent(),
-                "(name)"
-            )
-            .updateYearWithLatest(true)
+        licenseHeader("# SPDX-License-Identifier: Apache-2.0\n", "(name)")
     }
 }
diff --git a/src/main/kotlin/org.hiero.gradle.check.spotless.gradle.kts b/src/main/kotlin/org.hiero.gradle.check.spotless.gradle.kts
index 9ae0e6d..365bd2e 100644
--- a/src/main/kotlin/org.hiero.gradle.check.spotless.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.check.spotless.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("org.hiero.gradle.base.lifecycle")
     id("com.diffplug.spotless")
diff --git a/src/main/kotlin/org.hiero.gradle.feature.antlr.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.antlr.gradle.kts
index 0365dd8..d350461 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.antlr.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.antlr.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("java")
     id("antlr")
diff --git a/src/main/kotlin/org.hiero.gradle.feature.benchmark.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.benchmark.gradle.kts
index 0ce4d6a..4361107 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.benchmark.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.benchmark.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 import me.champeau.jmh.JMHTask
 
 plugins { id("me.champeau.jmh") }
diff --git a/src/main/kotlin/org.hiero.gradle.feature.build-cache.settings.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.build-cache.settings.gradle.kts
index d6cbd56..80b9a58 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.build-cache.settings.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.build-cache.settings.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 buildCache {
     remote<HttpBuildCache> {
         url = uri("https://cache.gradle.hedera.svcs.eng.swirldslabs.io/cache/")
diff --git a/src/main/kotlin/org.hiero.gradle.feature.git-properties-file.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.git-properties-file.gradle.kts
index c8f170d..0bbbfbd 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.git-properties-file.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.git-properties-file.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins { id("java") }
 
 tasks.register<WriteProperties>("writeGitProperties") {
diff --git a/src/main/kotlin/org.hiero.gradle.feature.java-compile.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.java-compile.gradle.kts
index c84f128..d17be37 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.java-compile.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.java-compile.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("java")
     id("org.gradlex.reproducible-builds")
diff --git a/src/main/kotlin/org.hiero.gradle.feature.java-doc.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.java-doc.gradle.kts
index e959a1a..0a4ee75 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.java-doc.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.java-doc.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("java")
     id("org.gradlex.reproducible-builds")
diff --git a/src/main/kotlin/org.hiero.gradle.feature.java-execute.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.java-execute.gradle.kts
index 460525f..4fa6bf7 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.java-execute.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.java-execute.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins { id("java") }
 
 tasks.withType<JavaExec>().configureEach {
diff --git a/src/main/kotlin/org.hiero.gradle.feature.protobuf.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.protobuf.gradle.kts
index 418a9db..4222b6f 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.protobuf.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.protobuf.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2023-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("java")
     id("com.google.protobuf")
diff --git a/src/main/kotlin/org.hiero.gradle.feature.publish-artifactregistry.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.publish-artifactregistry.gradle.kts
index 9066b1e..3f11360 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.publish-artifactregistry.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.publish-artifactregistry.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2023-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins { id("maven-publish") }
 
 if (gradle.startParameter.taskNames.any { it.startsWith("release") }) {
diff --git a/src/main/kotlin/org.hiero.gradle.feature.publish-gradle-plugin-portal.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.publish-gradle-plugin-portal.gradle.kts
index 429fe06..fd3c54b 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.publish-gradle-plugin-portal.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.publish-gradle-plugin-portal.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2016-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("java")
     id("com.gradle.plugin-publish")
diff --git a/src/main/kotlin/org.hiero.gradle.feature.publish-maven-central.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.publish-maven-central.gradle.kts
index fd3e295..01f2565 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.publish-maven-central.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.publish-maven-central.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2016-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("java")
     id("maven-publish")
diff --git a/src/main/kotlin/org.hiero.gradle.feature.publish-maven-central.root.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.publish-maven-central.root.gradle.kts
index 1501b72..4893959 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.publish-maven-central.root.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.publish-maven-central.root.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2023-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("org.hiero.gradle.base.lifecycle")
     id("io.github.gradle-nexus.publish-plugin")
diff --git a/src/main/kotlin/org.hiero.gradle.feature.publish-maven-repository.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.publish-maven-repository.gradle.kts
index 5762834..a8e9ea4 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.publish-maven-repository.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.publish-maven-repository.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2016-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 import java.util.Properties
 
 plugins {
diff --git a/src/main/kotlin/org.hiero.gradle.feature.repositories.settings.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.repositories.settings.gradle.kts
index bc545a7..92d32ac 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.repositories.settings.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.repositories.settings.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2016-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 dependencyResolutionManagement {
     @Suppress("UnstableApiUsage")
     repositories {
diff --git a/src/main/kotlin/org.hiero.gradle.feature.rust.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.rust.gradle.kts
index 275fe2f..39784f6 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.rust.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.rust.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 import org.hiero.gradle.extensions.CargoExtension
 import org.hiero.gradle.extensions.CargoToolchain.*
 import org.hiero.gradle.services.TaskLockService
diff --git a/src/main/kotlin/org.hiero.gradle.feature.test-fixtures.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.test-fixtures.gradle.kts
index efaaf9f..43eaa9a 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.test-fixtures.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.test-fixtures.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 import org.gradle.api.component.AdhocComponentWithVariants
 
 plugins { id("java-test-fixtures") }
diff --git a/src/main/kotlin/org.hiero.gradle.feature.test-hammer.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.test-hammer.gradle.kts
index a7ab230..408ffe0 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.test-hammer.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.test-hammer.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 import org.hiero.gradle.services.TaskLockService
 
 plugins { id("java") }
diff --git a/src/main/kotlin/org.hiero.gradle.feature.test-integration.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.test-integration.gradle.kts
index 270fc1e..214d5dc 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.test-integration.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.test-integration.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins { id("java") }
 
 // Tests that could be in the default "test" set but take more than 100ms to execute.
diff --git a/src/main/kotlin/org.hiero.gradle.feature.test-multios.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.test-multios.gradle.kts
index 87fc9c5..37f3acb 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.test-multios.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.test-multios.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins { id("java") }
 
 tasks.test {
diff --git a/src/main/kotlin/org.hiero.gradle.feature.test-time-consuming.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.test-time-consuming.gradle.kts
index a9c56c7..8690836 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.test-time-consuming.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.test-time-consuming.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins { id("java") }
 
 // Tests that could be in the default "test" set but take more than 100ms to execute.
diff --git a/src/main/kotlin/org.hiero.gradle.feature.test-timing-sensitive.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.test-timing-sensitive.gradle.kts
index 1a0e4c0..95933ec 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.test-timing-sensitive.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.test-timing-sensitive.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 import org.hiero.gradle.services.TaskLockService
 
 plugins { id("java") }
diff --git a/src/main/kotlin/org.hiero.gradle.feature.test.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.test.gradle.kts
index dbf7778..80a8249 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.test.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.test.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 import org.hiero.gradle.services.TaskLockService
 
 plugins { id("java") }
diff --git a/src/main/kotlin/org.hiero.gradle.feature.versioning.gradle.kts b/src/main/kotlin/org.hiero.gradle.feature.versioning.gradle.kts
index ba941a0..54e5577 100644
--- a/src/main/kotlin/org.hiero.gradle.feature.versioning.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.feature.versioning.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2023-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 import net.swiftzer.semver.SemVer
 
 val versionTxt = layout.projectDirectory.file("version.txt")
diff --git a/src/main/kotlin/org.hiero.gradle.module.application.gradle.kts b/src/main/kotlin/org.hiero.gradle.module.application.gradle.kts
index f7c7a67..fd6b648 100644
--- a/src/main/kotlin/org.hiero.gradle.module.application.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.module.application.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2016-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("application")
     id("jacoco")
diff --git a/src/main/kotlin/org.hiero.gradle.module.gradle-plugin.gradle.kts b/src/main/kotlin/org.hiero.gradle.module.gradle-plugin.gradle.kts
index d61758b..17542ec 100644
--- a/src/main/kotlin/org.hiero.gradle.module.gradle-plugin.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.module.gradle-plugin.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("java-library")
     id("org.hiero.gradle.feature.publish-maven-repository")
diff --git a/src/main/kotlin/org.hiero.gradle.module.library.gradle.kts b/src/main/kotlin/org.hiero.gradle.module.library.gradle.kts
index 7ac39b0..41a7f24 100644
--- a/src/main/kotlin/org.hiero.gradle.module.library.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.module.library.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins {
     id("java-library")
     id("org.hiero.gradle.feature.publish-maven-repository")
diff --git a/src/main/kotlin/org.hiero.gradle.report.code-coverage.gradle.kts b/src/main/kotlin/org.hiero.gradle.report.code-coverage.gradle.kts
index 59c5e33..a4eb4f3 100644
--- a/src/main/kotlin/org.hiero.gradle.report.code-coverage.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.report.code-coverage.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2023-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 import org.gradlex.javamodule.dependencies.tasks.ModuleDirectivesScopeCheck
 
 plugins {
diff --git a/src/main/kotlin/org.hiero.gradle.report.develocity.settings.gradle.kts b/src/main/kotlin/org.hiero.gradle.report.develocity.settings.gradle.kts
index 3c1149f..1f41853 100644
--- a/src/main/kotlin/org.hiero.gradle.report.develocity.settings.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.report.develocity.settings.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 plugins { id("com.gradle.develocity") }
 
 develocity {
diff --git a/src/main/kotlin/org.hiero.gradle.report.test-logger.gradle.kts b/src/main/kotlin/org.hiero.gradle.report.test-logger.gradle.kts
index 16e7686..c95233b 100644
--- a/src/main/kotlin/org.hiero.gradle.report.test-logger.gradle.kts
+++ b/src/main/kotlin/org.hiero.gradle.report.test-logger.gradle.kts
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 import com.adarshr.gradle.testlogger.theme.ThemeType
 
 plugins { id("com.adarshr.test-logger") }
diff --git a/src/main/kotlin/org/hiero/gradle/extensions/CargoExtension.kt b/src/main/kotlin/org/hiero/gradle/extensions/CargoExtension.kt
index 4c8610f..ae1b9f6 100644
--- a/src/main/kotlin/org/hiero/gradle/extensions/CargoExtension.kt
+++ b/src/main/kotlin/org/hiero/gradle/extensions/CargoExtension.kt
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package org.hiero.gradle.extensions
 
 import javax.inject.Inject
diff --git a/src/main/kotlin/org/hiero/gradle/extensions/CargoToolchain.kt b/src/main/kotlin/org/hiero/gradle/extensions/CargoToolchain.kt
index ead83ea..3d24829 100644
--- a/src/main/kotlin/org/hiero/gradle/extensions/CargoToolchain.kt
+++ b/src/main/kotlin/org/hiero/gradle/extensions/CargoToolchain.kt
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package org.hiero.gradle.extensions
 
 enum class CargoToolchain(val platform: String, val target: String, val folder: String) {
diff --git a/src/main/kotlin/org/hiero/gradle/services/TaskLockService.kt b/src/main/kotlin/org/hiero/gradle/services/TaskLockService.kt
index f63701e..a4a0342 100644
--- a/src/main/kotlin/org/hiero/gradle/services/TaskLockService.kt
+++ b/src/main/kotlin/org/hiero/gradle/services/TaskLockService.kt
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package org.hiero.gradle.services
 
 import org.gradle.api.services.BuildService
diff --git a/src/main/kotlin/org/hiero/gradle/spotless/RepairDashedCommentsFormatterStep.kt b/src/main/kotlin/org/hiero/gradle/spotless/RepairDashedCommentsFormatterStep.kt
index b0f16ce..96ef469 100644
--- a/src/main/kotlin/org/hiero/gradle/spotless/RepairDashedCommentsFormatterStep.kt
+++ b/src/main/kotlin/org/hiero/gradle/spotless/RepairDashedCommentsFormatterStep.kt
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package org.hiero.gradle.spotless
 
 import com.diffplug.spotless.FormatterFunc
diff --git a/src/main/kotlin/org/hiero/gradle/spotless/SortModuleInfoRequiresStep.kt b/src/main/kotlin/org/hiero/gradle/spotless/SortModuleInfoRequiresStep.kt
index 650f0e7..5c9aa09 100644
--- a/src/main/kotlin/org/hiero/gradle/spotless/SortModuleInfoRequiresStep.kt
+++ b/src/main/kotlin/org/hiero/gradle/spotless/SortModuleInfoRequiresStep.kt
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package org.hiero.gradle.spotless
 
 import com.diffplug.spotless.FormatterFunc
diff --git a/src/main/kotlin/org/hiero/gradle/tasks/CargoBuildTask.kt b/src/main/kotlin/org/hiero/gradle/tasks/CargoBuildTask.kt
index 5c850b2..156c97b 100644
--- a/src/main/kotlin/org/hiero/gradle/tasks/CargoBuildTask.kt
+++ b/src/main/kotlin/org/hiero/gradle/tasks/CargoBuildTask.kt
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package org.hiero.gradle.tasks
 
 import java.io.File
diff --git a/src/main/kotlin/org/hiero/gradle/tasks/GitClone.kt b/src/main/kotlin/org/hiero/gradle/tasks/GitClone.kt
index efc9ed0..97327a3 100644
--- a/src/main/kotlin/org/hiero/gradle/tasks/GitClone.kt
+++ b/src/main/kotlin/org/hiero/gradle/tasks/GitClone.kt
@@ -1,19 +1,4 @@
-/*
- * Copyright (C) 2022-2024 Hiero a Series of LF Projects, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package org.hiero.gradle.tasks
 
 import javax.inject.Inject