diff --git a/demo-multi-app/build.gradle b/demo-multi-app/build.gradle
index b021e32e..83867b10 100644
--- a/demo-multi-app/build.gradle
+++ b/demo-multi-app/build.gradle
@@ -20,7 +20,6 @@ sourceSets.test.java.srcDirs = ['test']
 sourceSets.main.resources.srcDirs = ['resources']
 
 dependencies {
-    implementation project(':docking-api')
     implementation project(':docking-ui')
     implementation project(':docking-multi-app')
 
@@ -35,11 +34,11 @@ dependencies {
 
 jar {
     manifest {
-        attributes "Main-Class": "MainFrame"
+        attributes "Main-Class": "basic.MainFrame"
     }
 
     from {
-        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+        configurations.compileClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     }
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
\ No newline at end of file
diff --git a/demo-single-app/build.gradle b/demo-single-app/build.gradle
index c513c79a..299c3501 100644
--- a/demo-single-app/build.gradle
+++ b/demo-single-app/build.gradle
@@ -20,7 +20,6 @@ sourceSets.test.java.srcDirs = ['test']
 sourceSets.main.resources.srcDirs = ['resources']
 
 dependencies {
-    implementation project(':docking-api')
     implementation project(':docking-ui')
     implementation project(':docking-single-app')
 
@@ -39,11 +38,11 @@ dependencies {
 
 jar {
     manifest {
-        attributes "Main-Class": "MainFrame"
+        attributes "Main-Class": "basic.MainFrame"
     }
 
     from {
-        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+        configurations.compileClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     }
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
\ No newline at end of file
diff --git a/docking-multi-app/build.gradle b/docking-multi-app/build.gradle
index 207e8628..039e84f7 100644
--- a/docking-multi-app/build.gradle
+++ b/docking-multi-app/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'java'
+	id 'java-library'
 	id 'idea'
 	id 'maven-publish'
 	id 'signing'
@@ -27,7 +27,7 @@ base {
 
 // NOTE: do not add new dependencies here, Modern Docking is a zero-dependency library
 dependencies {
-	implementation project(':docking-api')
+	api project(':docking-api')
 }
 
 java {
diff --git a/docking-single-app/build.gradle b/docking-single-app/build.gradle
index 4e9a7cf7..e77531d9 100644
--- a/docking-single-app/build.gradle
+++ b/docking-single-app/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'java'
+	id 'java-library'
 	id 'idea'
 	id 'maven-publish'
 	id 'signing'
@@ -27,7 +27,7 @@ base {
 
 // NOTE: do not add new dependencies here, Modern Docking is a zero-dependency library
 dependencies {
-	implementation project(':docking-api')
+	api project(':docking-api')
 }
 
 java {
diff --git a/docking-ui/build.gradle b/docking-ui/build.gradle
index 58e300b2..e6473dbd 100755
--- a/docking-ui/build.gradle
+++ b/docking-ui/build.gradle
@@ -1,5 +1,6 @@
 plugins {
 	id 'java'
+	id 'java-library'
 	id 'idea'
 	id 'maven-publish'
 	id 'signing'
@@ -26,7 +27,7 @@ base {
 }
 
 dependencies {
-	implementation project(':docking-api')
+	api project(':docking-api')
 
 	implementation 'com.formdev:flatlaf:3.3'
 	implementation 'com.formdev:flatlaf-extras:3.3'