diff --git a/cli/build.gradle.kts b/cli/build.gradle.kts
index 6c50b57b..1048554c 100644
--- a/cli/build.gradle.kts
+++ b/cli/build.gradle.kts
@@ -49,20 +49,19 @@ dependencies {
     implementation("com.charleskorn.kaml:kaml:0.59.0")
 }
 
+tasks.build {
+    finalizedBy("writeProperties")
+}
+
 tasks.test {
     useJUnitPlatform()
 }
 
-tasks.build {
-    val props = Properties()
-    val propsFile = File("${project.projectDir}/src/main/resources/META-INF/lcaac.properties")
-    propsFile.inputStream().use { props.load(it) }
-    props.setProperty("author", "Kleis Technology")
-    props.setProperty("description", "LCA as Code CLI")
-    props.setProperty("version", artifactVersion)
-    propsFile.outputStream().use {
-        props.store(it, null)
-    }
+tasks.register<WriteProperties>("writeProperties") {
+    outputFile = file("src/main/resources/META-INF/lcaac.properties")
+    property("author", "Kleis Technology")
+    property("description", "LCA as Code CLI")
+    property("version", artifactVersion)
 }
 
 publishing {
diff --git a/cli/src/main/resources/META-INF/lcaac.properties b/cli/src/main/resources/META-INF/lcaac.properties
index da203a83..fe6b4765 100644
--- a/cli/src/main/resources/META-INF/lcaac.properties
+++ b/cli/src/main/resources/META-INF/lcaac.properties
@@ -1,4 +1,3 @@
-#Thu Aug 14 10:41:08 CEST 2025
 author=Kleis Technology
 description=LCA as Code CLI
 version=1.8.0
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index facd516d..cd66cc63 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -61,6 +61,15 @@ tasks.test {
     }
 }
 
+tasks.register<Jar>("sourcesJar") {
+    archiveClassifier.set("sources")
+    from(kotlin.sourceSets.main.get().kotlin)
+}
+
+artifacts {
+    add("archives", tasks.named<Jar>("sourcesJar"))
+}
+
 publishing {
     repositories {
         maven {
@@ -78,6 +87,7 @@ publishing {
             artifactId = artifactId
             version = artifactVersion
             from(components["java"])
+            artifact(tasks.named("sourcesJar"))
         }
     }
 }
diff --git a/grammar/build.gradle.kts b/grammar/build.gradle.kts
index 5742e13f..5fda76e5 100644
--- a/grammar/build.gradle.kts
+++ b/grammar/build.gradle.kts
@@ -46,6 +46,7 @@ tasks.test {
     useJUnitPlatform()
 }
 
+
 sourceSets {
     main {
         java {
@@ -57,6 +58,18 @@ sourceSets {
     }
 }
 
+tasks.register<Jar>("sourcesJar") {
+    archiveClassifier.set("sources")
+    from("src/main/kotlin")
+    from("src/main/antlr")
+    from("src/main/gen")
+    dependsOn("generateGrammarSource")
+}
+
+artifacts {
+    add("archives", tasks.named<Jar>("sourcesJar"))
+}
+
 tasks {
     generateGrammarSource {
         outputDirectory = file("src/main/gen/ch/kleis/lcaac/grammar/parser")
@@ -95,6 +108,7 @@ publishing {
             artifactId = artifactId
             version = artifactVersion
             from(components["java"])
+            artifact(tasks.named("sourcesJar"))
         }
     }
 }