diff --git a/jaxb/alignment/build.gradle b/jaxb/alignment/build.gradle
index 360a9a1..72b05f5 100644
--- a/jaxb/alignment/build.gradle
+++ b/jaxb/alignment/build.gradle
@@ -10,9 +10,12 @@ dependencies {
 
 // https://github.com/bndtools/bnd/blob/master/gradle-plugins/README.md#replacing-use-of-gradles-deprecated-osgi-plugin
 jar {
-	bnd('Bundle-Name': 'HALE Alignment Format Model',
-	'Bundle-SymbolicName': 'eu.esdihumboldt.hale.common.align.io.model.jaxb',
-	'Bundle-License': 'http://www.gnu.org/licenses/lgpl.html;description=Lesser General Public License (LGPL) Version 3',
-	'Bundle-Vendor': 'data harmonisation panel',
-	'Require-Bundle': 'org.glassfish.jaxb.runtime')
+	bundle {
+		bnd('Bundle-Name': 'HALE Alignment Format Model',
+		'Bundle-SymbolicName': 'eu.esdihumboldt.hale.common.align.io.model.jaxb',
+		'Bundle-License': 'http://www.gnu.org/licenses/lgpl.html;description=Lesser General Public License (LGPL) Version 3',
+		'Bundle-Vendor': 'data harmonisation panel',
+		'Require-Bundle': 'org.glassfish.jaxb.runtime',
+		'Export-Package': "eu.esdihumboldt.hale.common.align.io.impl.internal.generated.*;version=$version")
+	}
 }
diff --git a/jaxb/oml/build.gradle b/jaxb/oml/build.gradle
index 9cc20ae..6f91872 100644
--- a/jaxb/oml/build.gradle
+++ b/jaxb/oml/build.gradle
@@ -10,6 +10,9 @@ dependencies {
 
 // https://github.com/bndtools/bnd/blob/master/gradle-plugins/README.md#replacing-use-of-gradles-deprecated-osgi-plugin
 jar {
-	bnd('Bundle-Name': 'Ontology Mapping Language Model',
-	'Bundle-SymbolicName': 'eu.esdihumboldt.hale.io.oml.model.jaxb')
+	bundle {
+		bnd('Bundle-Name': 'Ontology Mapping Language Model',
+		'Bundle-SymbolicName': 'eu.esdihumboldt.hale.io.oml.model.jaxb',
+		'Export-Package': "eu.esdihumboldt.hale.io.oml.internal.model.generated.oml.*;version=$version")
+	}
 }
diff --git a/jaxb/project/build.gradle b/jaxb/project/build.gradle
index 176d0f3..87eaa4b 100644
--- a/jaxb/project/build.gradle
+++ b/jaxb/project/build.gradle
@@ -11,9 +11,12 @@ dependencies {
 
 // https://github.com/bndtools/bnd/blob/master/gradle-plugins/README.md#replacing-use-of-gradles-deprecated-osgi-plugin
 jar {
-	bnd('Bundle-Name': 'HALE Project Format Model',
-	'Bundle-SymbolicName': 'eu.esdihumboldt.hale.common.core.io.project.model.jaxb',
-	'Bundle-License': 'http://www.gnu.org/licenses/lgpl.html;description=Lesser General Public License (LGPL) Version 3',
-	'Bundle-Vendor': 'data harmonisation panel',
-	'Require-Bundle': 'org.glassfish.jaxb.runtime')
+	bundle {
+		bnd('Bundle-Name': 'HALE Project Format Model',
+		'Bundle-SymbolicName': 'eu.esdihumboldt.hale.common.core.io.project.model.jaxb',
+		'Bundle-License': 'http://www.gnu.org/licenses/lgpl.html;description=Lesser General Public License (LGPL) Version 3',
+		'Bundle-Vendor': 'data harmonisation panel',
+		'Require-Bundle': 'org.glassfish.jaxb.runtime',
+		'Export-Package': "eu.esdihumboldt.hale.common.core.io.project.model.internal.generated.*;version=$version")
+	}
 }
diff --git a/jaxb/wadl/build.gradle b/jaxb/wadl/build.gradle
index ae11135..8d8c4fa 100644
--- a/jaxb/wadl/build.gradle
+++ b/jaxb/wadl/build.gradle
@@ -10,6 +10,9 @@ dependencies {
 
 // https://github.com/bndtools/bnd/blob/master/gradle-plugins/README.md#replacing-use-of-gradles-deprecated-osgi-plugin
 jar {
-	bnd('Bundle-Name': 'WADL Model',
-	'Bundle-SymbolicName': 'eu.esdihumboldt.hale.server.api.wadl.model.jaxb')
+	bundle {
+		bnd('Bundle-Name': 'WADL Model',
+		'Bundle-SymbolicName': 'eu.esdihumboldt.hale.server.api.wadl.model.jaxb',
+		'Export-Package': "eu.esdihumboldt.hale.server.api.wadl.internal.generated.*;version=$version")
+	}
 }