diff --git a/build.gradle b/build.gradle
index 0eecae08c..b7acc8422 100644
--- a/build.gradle
+++ b/build.gradle
@@ -97,7 +97,10 @@ allprojects {
                         "Implementation-Version": project.version,
                         "Built-By": System.getProperty("user.name"),
                         "Built-JDK": System.getProperty("java.version"),
-                        "Automatic-Module-Name": 'org.quartz'
+                        "Automatic-Module-Name": 'org.quartz',
+                        "-removeheaders": 'Private-Package',
+                        "Export-Package": 'org.quartz.*',
+                        "Import-Package": '*;resolution:=optional'
                 )
             }
         }
diff --git a/quartz-jobs/build.gradle b/quartz-jobs/build.gradle
index 2fce21b09..29384aecf 100644
--- a/quartz-jobs/build.gradle
+++ b/quartz-jobs/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'java-library'
     id 'maven-publish'
+    id 'biz.aQute.bnd.builder'
 }
 
 dependencies {
diff --git a/quartz/build.gradle b/quartz/build.gradle
index c139c00ce..3d0b67c64 100644
--- a/quartz/build.gradle
+++ b/quartz/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'java-library'
     id 'maven-publish'
+    id 'biz.aQute.bnd.builder'
 }
 
 repositories {
@@ -77,4 +78,4 @@ processResources {
     filesMatching('**/quartz-build.properties') {
         expand([version: project.version, fullname: project.fullname, name: project.name])
     }
-}
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index a06c1ed2e..a79ddb03a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,6 +2,7 @@
 pluginManagement {
     plugins {
         id("io.github.gradle-nexus.publish-plugin") version '2.0.0'
+        id ("biz.aQute.bnd.builder") version '6.4.0'
     }
 }