diff --git a/conventions-vclib/gradle-conventions-plugin b/conventions-vclib/gradle-conventions-plugin
index e852aedf8..50915887f 160000
--- a/conventions-vclib/gradle-conventions-plugin
+++ b/conventions-vclib/gradle-conventions-plugin
@@ -1 +1 @@
-Subproject commit e852aedf84eeb3f07f3e1669fe7689c114252a4c
+Subproject commit 50915887f31b90cbf1237a018f9143fb356593ea
diff --git a/vclib-aries/build.gradle.kts b/vclib-aries/build.gradle.kts
index 21c3faf4a..7435f659f 100644
--- a/vclib-aries/build.gradle.kts
+++ b/vclib-aries/build.gradle.kts
@@ -47,25 +47,18 @@ repositories {
     mavenCentral()
 }
 
-val javadocJar = setupDokka()
+val javadocJar = setupDokka(baseUrl = "https://github.com/a-sit-plus/kmm-vc-library/tree/main/", multiModuleDoc = true)
 
-tasks.dokkaHtmlPartial{
-    dependsOn(":vclib:transformIosMainCInteropDependenciesMetadataForIde")
-    dependsOn(":vclib-openid:transformIosMainCInteropDependenciesMetadataForIde")
-    dokkaSourceSets {
-        configureEach {
-            sourceLink {
-                localDirectory.set(file("src/$name/kotlin"))
-                remoteUrl.set(
-                    uri("https://github.com/a-sit-plus/kmm-vc-library/tree/main/${project.name}/src/$name/kotlin").toURL()
-                )
-                // Suffix which is used to append the line number to the URL. Use #L for GitHub
-                remoteLineSuffix.set("#L")
-            }
-        }
-    }
+//workaround for borked implicit dependencies
+tasks.filter { it.name.startsWith("dokkaHtml") }.forEach {
+    it.dependsOn(
+        ":vclib:transformIosMainCInteropDependenciesMetadataForIde",
+        ":vclib-openid:transformIosMainCInteropDependenciesMetadataForIde"
+    )
 }
 
+
+
 publishing {
     publications {
         withType<MavenPublication> {
diff --git a/vclib-openid/build.gradle.kts b/vclib-openid/build.gradle.kts
index feed381e5..5e10e537b 100644
--- a/vclib-openid/build.gradle.kts
+++ b/vclib-openid/build.gradle.kts
@@ -47,7 +47,16 @@ repositories {
     mavenCentral()
 }
 
-val javadocJar = setupDokka()
+val javadocJar = setupDokka(baseUrl = "https://github.com/a-sit-plus/kmm-vc-library/tree/main/", multiModuleDoc = true)
+
+//workaround for borked implicit dependencies
+tasks.filter { it.name.startsWith("dokkaHtml") }.forEach {
+    it.dependsOn(
+        ":vclib-aries:transformIosMainCInteropDependenciesMetadataForIde",
+        ":vclib:transformIosMainCInteropDependenciesMetadataForIde"
+    )
+}
+
 
 publishing {
     publications {
@@ -101,19 +110,3 @@ signing {
     sign(publishing.publications)
 }
 
-tasks.dokkaHtmlPartial{
-    dependsOn(":vclib-aries:transformIosMainCInteropDependenciesMetadataForIde")
-    dependsOn(":vclib:transformIosMainCInteropDependenciesMetadataForIde")
-    dokkaSourceSets {
-        configureEach {
-            sourceLink {
-                localDirectory.set(file("src/$name/kotlin"))
-                remoteUrl.set(
-                    uri("https://github.com/a-sit-plus/kmm-vc-library/tree/main/${project.name}/src/$name/kotlin").toURL()
-                )
-                // Suffix which is used to append the line number to the URL. Use #L for GitHub
-                remoteLineSuffix.set("#L")
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/vclib/build.gradle.kts b/vclib/build.gradle.kts
index dac2c0feb..819d1a55a 100644
--- a/vclib/build.gradle.kts
+++ b/vclib/build.gradle.kts
@@ -74,7 +74,13 @@ repositories {
 }
 
 
-val javadocJar = setupDokka()
+val javadocJar = setupDokka(baseUrl = "https://github.com/a-sit-plus/kmm-vc-library/tree/main/", multiModuleDoc = true)
+
+//workaround for borked implicit dependencies
+tasks.filter { it.name.startsWith("dokkaHtml") }.forEach {
+    it.dependsOn(":vclib:transformIosMainCInteropDependenciesMetadataForIde")
+}
+
 
 publishing {
     publications {
@@ -130,20 +136,3 @@ signing {
     sign(publishing.publications)
 }
 
-
-tasks.dokkaHtmlPartial {
-
-    dependsOn(":vclib:transformIosMainCInteropDependenciesMetadataForIde")
-    dokkaSourceSets {
-        configureEach {
-            sourceLink {
-                localDirectory.set(file("src/$name/kotlin"))
-                remoteUrl.set(
-                    uri("https://github.com/a-sit-plus/kmm-vc-library/tree/main/${project.name}/src/$name/kotlin").toURL()
-                )
-                // Suffix which is used to append the line number to the URL. Use #L for GitHub
-                remoteLineSuffix.set("#L")
-            }
-        }
-    }
-}
\ No newline at end of file