diff --git a/mcp-core/pom.xml b/mcp-core/pom.xml
index 0c8650f46..64a485cd2 100644
--- a/mcp-core/pom.xml
+++ b/mcp-core/pom.xml
@@ -20,50 +20,6 @@
 		<developerConnection>git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
 	</scm>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>biz.aQute.bnd</groupId>
-				<artifactId>bnd-maven-plugin</artifactId>
-				<version>${bnd-maven-plugin.version}</version>
-				<executions>
-					<execution>
-						<id>bnd-process</id>
-						<goals>
-							<goal>bnd-process</goal>
-						</goals>
-						<configuration>
-							<bnd><![CDATA[
-								Bundle-Name:            Bundle ${project.groupId} : ${project.artifactId}
-								version:                ${versionmask;===;${version_cleanup;${project.version}}}
-								Bundle-SymbolicName:    ${project.groupId}.${project.artifactId}
-								Bundle-Version:         ${version}
-								Automatic-Module-Name:  ${project.groupId}.${project.artifactId}
-								Import-Package:         jakarta.*;resolution:=optional, \
-								                        *;
-								Export-Package:         io.modelcontextprotocol.*;version="${version}";-noimport:=true
-								-noimportjava:          true;
-								-nouses:                true;
-								-removeheaders:         Private-Package
-								]]>
-							</bnd>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-					</archive>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
 	<dependencies>
         <dependency>
             <groupId>io.modelcontextprotocol.sdk</groupId>
diff --git a/pom.xml b/pom.xml
index dc0e5101b..05afee323 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
 		<json-unit-assertj.version>4.1.0</json-unit-assertj.version>
 		<json-schema-validator-jackson2.version>2.0.0</json-schema-validator-jackson2.version>
 		<json-schema-validator-jackson3.version>3.0.0</json-schema-validator-jackson3.version>
-
+		<build-helper-maven-plugin.version>3.6.1</build-helper-maven-plugin.version>
 	</properties>
 
 	<modules>
@@ -118,6 +118,28 @@
 
 	<build>
 		<plugins>
+            <!-- Derive automatic module name from groupId, artifactId, replacing '-' with '.' -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>${build-helper-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>rename-property</id>
+                        <goals>
+                            <goal>regex-property</goal>
+                        </goals>
+                        <phase>validate</phase>
+                        <configuration>
+                            <name>automatic.module.name</name>
+                            <value>${project.groupId}.${project.artifactId}</value>
+                            <regex>-</regex>
+                            <replacement>.</replacement>
+                            <failIfNoMatch>false</failIfNoMatch>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 			<plugin>
 				<groupId>io.spring.javaformat</groupId>
 				<artifactId>spring-javaformat-maven-plugin</artifactId>
@@ -211,6 +233,7 @@
 						<manifestEntries>
 							<Implementation-Title>${project.artifactId}</Implementation-Title>
 							<Implementation-Version>${project.version}</Implementation-Version>
+                            <Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
 						</manifestEntries>
 					</archive>
 				</configuration>