diff --git a/build.gradle.kts b/build.gradle.kts
index 3740e3c..2e260fd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -82,8 +82,8 @@ java {
 tasks.withType<Jar>().configureEach {
     manifest.attributes(
         "Implementation-Title" to project.name,
-        "Implementation-Vendor" to metadata.organization.get().name.get(),
-        "Implementation-Version" to project.version,
+        "Implementation-Vendor" to metadata.organization.provider.flatMap { it.name },
+        "Implementation-Version" to provider { project.version.toString() },
     )
 }