diff --git a/pom.xml b/pom.xml
index 26aef342cbd..41d80cf24fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,8 @@
   </modules>
 
   <properties>
+    <javacpp.platform>${os.name}-${os.arch}</javacpp.platform>
+
     <project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/tensorflow-core/pom.xml b/tensorflow-core/pom.xml
index 89b4b06a2d3..d0ea8480f95 100644
--- a/tensorflow-core/pom.xml
+++ b/tensorflow-core/pom.xml
@@ -34,7 +34,6 @@
     <module>tensorflow-core-native</module>
     <module>tensorflow-core-generator</module>
     <module>tensorflow-core-api</module>
-    <module>tensorflow-core-platform</module>
   </modules>
 
   <properties>
@@ -61,7 +60,6 @@
     <javacpp.platform.macosx-x86_64.extension>macosx-x86_64${javacpp.platform.extension}</javacpp.platform.macosx-x86_64.extension>
     <javacpp.platform.windows-x86_64.extension>windows-x86_64${javacpp.platform.extension}</javacpp.platform.windows-x86_64.extension>
     <javacpp.version>1.5.10</javacpp.version>
-
   </properties>
 
   <profiles>
@@ -71,601 +69,9 @@
         must have already been built, tested and deployed priorly from their respective platform.
       -->
       <id>deploying</id>
-      <properties>
-        <javacpp.platform>${os.name}-${os.arch}</javacpp.platform>
-      </properties>
-    </profile>
-
-    <profile>
-      <!--
-        All supported platforms are being replaced by the current host platform, mostly useful for local builds.
-        The artifacts produced by this build can only run on the current host (or other machines of the same
-        platform). This is the default profile.
-      -->
-      <id>javacpp-platform-host</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-        <property>
-          <name>javacpp.platform.host</name>
-        </property>
-      </activation>
-      <properties>
-        <javacpp.platform>${os.name}-${os.arch}</javacpp.platform>
-        <javacpp.platform.linux-armhf>${os.name}-${os.arch}</javacpp.platform.linux-armhf>
-        <javacpp.platform.linux-arm64>${os.name}-${os.arch}</javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-x86_64>${os.name}-${os.arch}</javacpp.platform.linux-x86_64>
-        <javacpp.platform.macosx-arm64>${os.name}-${os.arch}</javacpp.platform.macosx-arm64>
-        <javacpp.platform.macosx-x86_64>${os.name}-${os.arch}</javacpp.platform.macosx-x86_64>
-        <javacpp.platform.windows-x86_64>${os.name}-${os.arch}</javacpp.platform.windows-x86_64>
-        <javacpp.platform.linux-armhf.extension>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-armhf.extension>
-        <javacpp.platform.linux-arm64.extension>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-arm64.extension>
-        <javacpp.platform.linux-x86_64.extension>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-x86_64.extension>
-        <javacpp.platform.macosx-arm64.extension>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.macosx-arm64.extension>
-        <javacpp.platform.macosx-x86_64.extension>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.macosx-x86_64.extension>
-        <javacpp.platform.windows-x86_64.extension>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.windows-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp-platform-custom</id>
-      <activation>
-        <property>
-          <name>javacpp.platform</name>
-        </property>
-      </activation>
-      <properties>
-        <javacpp.platform.linux-armhf>${javacpp.platform}</javacpp.platform.linux-armhf>
-        <javacpp.platform.linux-arm64>${javacpp.platform}</javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-ppc64le>${javacpp.platform}</javacpp.platform.linux-ppc64le>
-        <javacpp.platform.linux-x86>${javacpp.platform}</javacpp.platform.linux-x86>
-        <javacpp.platform.linux-x86_64>${javacpp.platform}</javacpp.platform.linux-x86_64>
-        <javacpp.platform.macosx-arm64>${javacpp.platform}</javacpp.platform.macosx-arm64>
-        <javacpp.platform.macosx-x86_64>${javacpp.platform}</javacpp.platform.macosx-x86_64>
-        <javacpp.platform.windows-x86>${javacpp.platform}</javacpp.platform.windows-x86>
-        <javacpp.platform.windows-x86_64>${javacpp.platform}</javacpp.platform.windows-x86_64>
-        <javacpp.platform.linux-armhf.extension>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-armhf.extension>
-        <javacpp.platform.linux-arm64.extension>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-arm64.extension>
-        <javacpp.platform.linux-ppc64le.extension>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-ppc64le.extension>
-        <javacpp.platform.linux-x86.extension>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86.extension>
-        <javacpp.platform.linux-x86_64.extension>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86_64.extension>
-        <javacpp.platform.macosx-arm64.extension>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.macosx-arm64.extension>
-        <javacpp.platform.macosx-x86_64.extension>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.macosx-x86_64.extension>
-        <javacpp.platform.windows-x86.extension>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.windows-x86.extension>
-        <javacpp.platform.windows-x86_64.extension>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.windows-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.custom-true</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.custom</name>
-        </property>
-      </activation>
-      <properties>
-        <javacpp.platform></javacpp.platform>
-        <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
-        <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
-        <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
-        <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
-        <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
-        <javacpp.platform.macosx-x86_64></javacpp.platform.macosx-x86_64>
-        <javacpp.platform.windows-x86></javacpp.platform.windows-x86>
-        <javacpp.platform.windows-x86_64></javacpp.platform.windows-x86_64>
-        <javacpp.platform.linux-armhf.extension></javacpp.platform.linux-armhf.extension>
-        <javacpp.platform.linux-arm64.extension></javacpp.platform.linux-arm64.extension>
-        <javacpp.platform.linux-ppc64le.extension></javacpp.platform.linux-ppc64le.extension>
-        <javacpp.platform.linux-x86.extension></javacpp.platform.linux-x86.extension>
-        <javacpp.platform.linux-x86_64.extension></javacpp.platform.linux-x86_64.extension>
-        <javacpp.platform.macosx-arm64.extension></javacpp.platform.macosx-arm64.extension>
-        <javacpp.platform.macosx-x86_64.extension></javacpp.platform.macosx-x86_64.extension>
-        <javacpp.platform.windows-x86.extension></javacpp.platform.windows-x86.extension>
-        <javacpp.platform.windows-x86_64.extension></javacpp.platform.windows-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp-platform-none</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.none</name>
-        </property>
-      </activation>
-      <properties>
-        <javacpp.platform></javacpp.platform>
-        <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
-        <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
-        <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
-        <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
-        <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
-        <javacpp.platform.macosx-x86_64></javacpp.platform.macosx-x86_64>
-        <javacpp.platform.windows-x86></javacpp.platform.windows-x86>
-        <javacpp.platform.windows-x86_64></javacpp.platform.windows-x86_64>
-        <javacpp.platform.linux-armhf.extension></javacpp.platform.linux-armhf.extension>
-        <javacpp.platform.linux-arm64.extension></javacpp.platform.linux-arm64.extension>
-        <javacpp.platform.linux-ppc64le.extension></javacpp.platform.linux-ppc64le.extension>
-        <javacpp.platform.linux-x86.extension></javacpp.platform.linux-x86.extension>
-        <javacpp.platform.linux-x86_64.extension></javacpp.platform.linux-x86_64.extension>
-        <javacpp.platform.macosx-arm64.extension></javacpp.platform.macosx-arm64.extension>
-        <javacpp.platform.macosx-x86_64.extension></javacpp.platform.macosx-x86_64.extension>
-        <javacpp.platform.windows-x86.extension></javacpp.platform.windows-x86.extension>
-        <javacpp.platform.windows-x86_64.extension></javacpp.platform.windows-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp-platform-linux-armhf</id>
-      <activation>
-        <property>
-          <name>javacpp.platform</name>
-          <value>linux-armhf</value>
-        </property>
-      </activation>
-      <properties>
-        <javacpp.platform.linux-armhf>${javacpp.platform}</javacpp.platform.linux-armhf>
-        <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
-        <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
-        <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
-        <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
-        <javacpp.platform.macosx-x86_64></javacpp.platform.macosx-x86_64>
-        <javacpp.platform.windows-x86></javacpp.platform.windows-x86>
-        <javacpp.platform.windows-x86_64></javacpp.platform.windows-x86_64>
-        <javacpp.platform.linux-armhf.extension>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-armhf.extension>
-        <javacpp.platform.linux-arm64.extension></javacpp.platform.linux-arm64.extension>
-        <javacpp.platform.linux-ppc64le.extension></javacpp.platform.linux-ppc64le.extension>
-        <javacpp.platform.linux-x86.extension></javacpp.platform.linux-x86.extension>
-        <javacpp.platform.linux-x86_64.extension></javacpp.platform.linux-x86_64.extension>
-        <javacpp.platform.macosx-arm64.extension></javacpp.platform.macosx-arm64.extension>
-        <javacpp.platform.macosx-x86_64.extension></javacpp.platform.macosx-x86_64.extension>
-        <javacpp.platform.windows-x86.extension></javacpp.platform.windows-x86.extension>
-        <javacpp.platform.windows-x86_64.extension></javacpp.platform.windows-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp-platform-linux-arm64</id>
-      <activation>
-        <property>
-          <name>javacpp.platform</name>
-          <value>linux-arm64</value>
-        </property>
-      </activation>
-      <properties>
-        <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
-        <javacpp.platform.linux-arm64>${javacpp.platform}</javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
-        <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
-        <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
-        <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
-        <javacpp.platform.macosx-x86_64></javacpp.platform.macosx-x86_64>
-        <javacpp.platform.windows-x86></javacpp.platform.windows-x86>
-        <javacpp.platform.windows-x86_64></javacpp.platform.windows-x86_64>
-        <javacpp.platform.linux-armhf.extension></javacpp.platform.linux-armhf.extension>
-        <javacpp.platform.linux-arm64.extension>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-arm64.extension>
-        <javacpp.platform.linux-ppc64le.extension></javacpp.platform.linux-ppc64le.extension>
-        <javacpp.platform.linux-x86.extension></javacpp.platform.linux-x86.extension>
-        <javacpp.platform.linux-x86_64.extension></javacpp.platform.linux-x86_64.extension>
-        <javacpp.platform.macosx-arm64.extension></javacpp.platform.macosx-arm64.extension>
-        <javacpp.platform.macosx-x86_64.extension></javacpp.platform.macosx-x86_64.extension>
-        <javacpp.platform.windows-x86.extension></javacpp.platform.windows-x86.extension>
-        <javacpp.platform.windows-x86_64.extension></javacpp.platform.windows-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp-platform-linux-x86_64</id>
-      <activation>
-        <property>
-          <name>javacpp.platform</name>
-          <value>linux-x86_64</value>
-        </property>
-      </activation>
-      <properties>
-        <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
-        <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
-        <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
-        <javacpp.platform.linux-x86_64>${javacpp.platform}</javacpp.platform.linux-x86_64>
-        <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
-        <javacpp.platform.macosx-x86_64></javacpp.platform.macosx-x86_64>
-        <javacpp.platform.windows-x86></javacpp.platform.windows-x86>
-        <javacpp.platform.windows-x86_64></javacpp.platform.windows-x86_64>
-        <javacpp.platform.linux-armhf.extension></javacpp.platform.linux-armhf.extension>
-        <javacpp.platform.linux-arm64.extension></javacpp.platform.linux-arm64.extension>
-        <javacpp.platform.linux-ppc64le.extension></javacpp.platform.linux-ppc64le.extension>
-        <javacpp.platform.linux-x86.extension></javacpp.platform.linux-x86.extension>
-        <javacpp.platform.linux-x86_64.extension>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86_64.extension>
-        <javacpp.platform.macosx-arm64.extension></javacpp.platform.macosx-arm64.extension>
-        <javacpp.platform.macosx-x86_64.extension></javacpp.platform.macosx-x86_64.extension>
-        <javacpp.platform.windows-x86.extension></javacpp.platform.windows-x86.extension>
-        <javacpp.platform.windows-x86_64.extension></javacpp.platform.windows-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp-platform-macosx-arm64</id>
-      <activation>
-        <property>
-          <name>javacpp.platform</name>
-          <value>macosx-arm64</value>
-        </property>
-      </activation>
-      <properties>
-        <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
-        <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
-        <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
-        <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
-        <javacpp.platform.macosx-arm64>${javacpp.platform}</javacpp.platform.macosx-arm64>
-        <javacpp.platform.macosx-x86_64></javacpp.platform.macosx-x86_64>
-        <javacpp.platform.windows-x86></javacpp.platform.windows-x86>
-        <javacpp.platform.windows-x86_64></javacpp.platform.windows-x86_64>
-        <javacpp.platform.linux-armhf.extension></javacpp.platform.linux-armhf.extension>
-        <javacpp.platform.linux-arm64.extension></javacpp.platform.linux-arm64.extension>
-        <javacpp.platform.linux-ppc64le.extension></javacpp.platform.linux-ppc64le.extension>
-        <javacpp.platform.linux-x86.extension></javacpp.platform.linux-x86.extension>
-        <javacpp.platform.linux-x86_64.extension></javacpp.platform.linux-x86_64.extension>
-        <javacpp.platform.macosx-arm64.extension>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.macosx-arm64.extension>
-        <javacpp.platform.macosx-x86_64.extension></javacpp.platform.macosx-x86_64.extension>
-        <javacpp.platform.windows-x86.extension></javacpp.platform.windows-x86.extension>
-        <javacpp.platform.windows-x86_64.extension></javacpp.platform.windows-x86_64.extension>
-      </properties>
+      <modules>
+        <module>tensorflow-core-platform</module>
+      </modules>
     </profile>
-
-    <profile>
-      <id>javacpp-platform-macosx-x86_64</id>
-      <activation>
-        <property>
-          <name>javacpp.platform</name>
-          <value>macosx-x86_64</value>
-        </property>
-      </activation>
-      <properties>
-        <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
-        <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
-        <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
-        <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
-        <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
-        <javacpp.platform.macosx-x86_64>${javacpp.platform}</javacpp.platform.macosx-x86_64>
-        <javacpp.platform.windows-x86></javacpp.platform.windows-x86>
-        <javacpp.platform.windows-x86_64></javacpp.platform.windows-x86_64>
-        <javacpp.platform.linux-armhf.extension></javacpp.platform.linux-armhf.extension>
-        <javacpp.platform.linux-arm64.extension></javacpp.platform.linux-arm64.extension>
-        <javacpp.platform.linux-ppc64le.extension></javacpp.platform.linux-ppc64le.extension>
-        <javacpp.platform.linux-x86.extension></javacpp.platform.linux-x86.extension>
-        <javacpp.platform.linux-x86_64.extension></javacpp.platform.linux-x86_64.extension>
-        <javacpp.platform.macosx-arm64.extension></javacpp.platform.macosx-arm64.extension>
-        <javacpp.platform.macosx-x86_64.extension>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.macosx-x86_64.extension>
-        <javacpp.platform.windows-x86.extension></javacpp.platform.windows-x86.extension>
-        <javacpp.platform.windows-x86_64.extension></javacpp.platform.windows-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp-platform-windows-x86_64</id>
-      <activation>
-        <property>
-          <name>javacpp.platform</name>
-          <value>windows-x86_64</value>
-        </property>
-      </activation>
-      <properties>
-        <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
-        <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
-        <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
-        <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
-        <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
-        <javacpp.platform.macosx-x86_64></javacpp.platform.macosx-x86_64>
-        <javacpp.platform.windows-x86></javacpp.platform.windows-x86>
-        <javacpp.platform.windows-x86_64>${javacpp.platform}</javacpp.platform.windows-x86_64>
-        <javacpp.platform.linux-armhf.extension></javacpp.platform.linux-armhf.extension>
-        <javacpp.platform.linux-arm64.extension></javacpp.platform.linux-arm64.extension>
-        <javacpp.platform.linux-ppc64le.extension></javacpp.platform.linux-ppc64le.extension>
-        <javacpp.platform.linux-x86.extension></javacpp.platform.linux-x86.extension>
-        <javacpp.platform.linux-x86_64.extension></javacpp.platform.linux-x86_64.extension>
-        <javacpp.platform.macosx-arm64.extension></javacpp.platform.macosx-arm64.extension>
-        <javacpp.platform.macosx-x86_64.extension></javacpp.platform.macosx-x86_64.extension>
-        <javacpp.platform.windows-x86.extension></javacpp.platform.windows-x86.extension>
-        <javacpp.platform.windows-x86_64.extension>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.windows-x86_64.extension>
-      </properties>
-    </profile>
-
-    <!-- Profiles to modify the transitive dependencies when picked up from other pom.xml files, for example:
-         mvn -Djavacpp.platform.custom -Djavacpp.platform.host -Djavacpp.platform.linux-x86_64 -Djavacpp.platform.windows-x86_64 ... -->
-    <profile>
-      <id>javacpp.platform.linux-armhf-true</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.linux-armhf</name>
-        </property>
-      </activation>
-      <properties>
-        <javacpp.platform.linux-armhf>linux-armhf</javacpp.platform.linux-armhf>
-        <javacpp.platform.linux-armhf.extension>linux-armhf${javacpp.platform.extension}</javacpp.platform.linux-armhf.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.linux-arm64-true</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.linux-arm64</name>
-        </property>
-      </activation>
-      <properties>
-        <javacpp.platform.linux-arm64>linux-arm64</javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-arm64.extension>linux-arm64${javacpp.platform.extension}</javacpp.platform.linux-arm64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.linux-x86_64-true</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.linux-x86_64</name>
-        </property>
-      </activation>
-      <properties>
-        <javacpp.platform.linux-x86_64>linux-x86_64</javacpp.platform.linux-x86_64>
-        <javacpp.platform.linux-x86_64.extension>linux-x86_64${javacpp.platform.extension}</javacpp.platform.linux-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.macosx-arm64-true</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.macosx-arm64</name>
-        </property>
-      </activation>
-      <properties>
-        <javacpp.platform.macosx-arm64>macosx-arm64</javacpp.platform.macosx-arm64>
-        <javacpp.platform.macosx-arm64.extension>macosx-arm64${javacpp.platform.extension}</javacpp.platform.macosx-arm64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.macosx-x86_64-true</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.macosx-x86_64</name>
-        </property>
-      </activation>
-      <properties>
-        <javacpp.platform.macosx-x86_64>macosx-x86_64</javacpp.platform.macosx-x86_64>
-        <javacpp.platform.macosx-x86_64.extension>macosx-x86_64${javacpp.platform.extension}</javacpp.platform.macosx-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.windows-x86_64-true</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.windows-x86_64</name>
-        </property>
-      </activation>
-      <properties>
-        <javacpp.platform.windows-x86_64>windows-x86_64</javacpp.platform.windows-x86_64>
-        <javacpp.platform.windows-x86_64.extension>windows-x86_64${javacpp.platform.extension}</javacpp.platform.windows-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.custom-linux-arm</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.host</name>
-        </property>
-        <os><name>linux</name><arch>arm</arch></os>
-      </activation>
-      <properties>
-        <javacpp.platform.linux-armhf>linux-armhf</javacpp.platform.linux-armhf>
-        <javacpp.platform.linux-armhf.extension>linux-armhf${javacpp.platform.extension}</javacpp.platform.linux-armhf.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.custom-linux-armhf</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.host</name>
-        </property>
-        <os><name>linux</name><arch>armhf</arch></os>
-      </activation>
-      <properties>
-        <javacpp.platform.linux-armhf>linux-armhf</javacpp.platform.linux-armhf>
-        <javacpp.platform.linux-armhf.extension>linux-armhf${javacpp.platform.extension}</javacpp.platform.linux-armhf.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.custom-linux-aarch64</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.host</name>
-        </property>
-        <os><name>linux</name><arch>aarch64</arch></os>
-      </activation>
-      <properties>
-        <javacpp.platform.linux-arm64>linux-arm64</javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-arm64.extension>linux-arm64${javacpp.platform.extension}</javacpp.platform.linux-arm64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.custom-linux-armv8</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.host</name>
-        </property>
-        <os><name>linux</name><arch>armv8</arch></os>
-      </activation>
-      <properties>
-        <javacpp.platform.linux-arm64>linux-arm64</javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-arm64.extension>linux-arm64${javacpp.platform.extension}</javacpp.platform.linux-arm64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.custom-linux-arm64</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.host</name>
-        </property>
-        <os><name>linux</name><arch>arm64</arch></os>
-      </activation>
-      <properties>
-        <javacpp.platform.linux-arm64>linux-arm64</javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-arm64.extension>linux-arm64${javacpp.platform.extension}</javacpp.platform.linux-arm64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.custom-linux-amd64</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.host</name>
-        </property>
-        <os><name>linux</name><arch>amd64</arch></os>
-      </activation>
-      <properties>
-        <javacpp.platform.linux-x86_64>linux-x86_64</javacpp.platform.linux-x86_64>
-        <javacpp.platform.linux-x86_64.extension>linux-x86_64${javacpp.platform.extension}</javacpp.platform.linux-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.custom-linux-x86-64</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.host</name>
-        </property>
-        <os><name>linux</name><arch>x86-64</arch></os>
-      </activation>
-      <properties>
-        <javacpp.platform.linux-x86_64>linux-x86_64</javacpp.platform.linux-x86_64>
-        <javacpp.platform.linux-x86_64.extension>linux-x86_64${javacpp.platform.extension}</javacpp.platform.linux-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.custom-linux-x86_64</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.host</name>
-        </property>
-        <os><name>linux</name><arch>x86_64</arch></os>
-      </activation>
-      <properties>
-        <javacpp.platform.linux-x86_64>linux-x86_64</javacpp.platform.linux-x86_64>
-        <javacpp.platform.linux-x86_64.extension>linux-x86_64${javacpp.platform.extension}</javacpp.platform.linux-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.custom-macosx-amd64</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.host</name>
-        </property>
-        <os><name>mac os x</name><arch>amd64</arch></os>
-      </activation>
-      <properties>
-        <javacpp.platform.macosx-x86_64>macosx-x86_64</javacpp.platform.macosx-x86_64>
-        <javacpp.platform.macosx-x86_64.extension>macosx-x86_64${javacpp.platform.extension}</javacpp.platform.macosx-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.custom-macosx-x86-64</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.host</name>
-        </property>
-        <os><name>mac os x</name><arch>x86-64</arch></os>
-      </activation>
-      <properties>
-        <javacpp.platform.macosx-x86_64>macosx-x86_64</javacpp.platform.macosx-x86_64>
-        <javacpp.platform.macosx-x86_64.extension>macosx-x86_64${javacpp.platform.extension}</javacpp.platform.macosx-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.custom-macosx-aarch64</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.host</name>
-        </property>
-        <os><name>mac os x</name><arch>aarch64</arch></os>
-      </activation>
-      <properties>
-        <javacpp.platform.macosx-arm64>macosx-arm64</javacpp.platform.macosx-arm64>
-        <javacpp.platform.macosx-arm64.extension>macosx-arm64${javacpp.platform.extension}</javacpp.platform.macosx-arm64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.custom-macosx-x86_64</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.host</name>
-        </property>
-        <os><name>mac os x</name><arch>x86_64</arch></os>
-      </activation>
-      <properties>
-        <javacpp.platform.macosx-x86_64>macosx-x86_64</javacpp.platform.macosx-x86_64>
-        <javacpp.platform.macosx-x86_64.extension>macosx-x86_64${javacpp.platform.extension}</javacpp.platform.macosx-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.custom-windows-amd64</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.host</name>
-        </property>
-        <os><family>windows</family><arch>amd64</arch></os>
-      </activation>
-      <properties>
-        <javacpp.platform.windows-x86_64>windows-x86_64</javacpp.platform.windows-x86_64>
-        <javacpp.platform.windows-x86_64.extension>windows-x86_64${javacpp.platform.extension}</javacpp.platform.windows-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.custom-windows-x86-64</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.host</name>
-        </property>
-        <os><family>windows</family><arch>x86-64</arch></os>
-      </activation>
-      <properties>
-        <javacpp.platform.windows-x86_64>windows-x86_64</javacpp.platform.windows-x86_64>
-        <javacpp.platform.windows-x86_64.extension>windows-x86_64${javacpp.platform.extension}</javacpp.platform.windows-x86_64.extension>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>javacpp.platform.custom-windows-x86_64</id>
-      <activation>
-        <property>
-          <name>javacpp.platform.host</name>
-        </property>
-        <os><family>windows</family><arch>x86_64</arch></os>
-      </activation>
-      <properties>
-        <javacpp.platform.windows-x86_64>windows-x86_64</javacpp.platform.windows-x86_64>
-        <javacpp.platform.windows-x86_64.extension>windows-x86_64${javacpp.platform.extension}</javacpp.platform.windows-x86_64.extension>
-      </properties>
-    </profile>
-
   </profiles>
-
 </project>
-
diff --git a/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/generator/op/javadoc/CoreJavaDocNodeRenderer.java b/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/generator/op/javadoc/CoreJavaDocNodeRenderer.java
index 58da60c7d8b..cc80f5f0bb6 100644
--- a/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/generator/op/javadoc/CoreJavaDocNodeRenderer.java
+++ b/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/generator/op/javadoc/CoreJavaDocNodeRenderer.java
@@ -155,6 +155,7 @@ public class CoreJavaDocNodeRenderer extends AbstractVisitor implements NodeRend
           "../../../api_docs/python/math_ops", "org.tensorflow.op.MathOps",
           "https://www.tensorflow.org/api_docs/python/tf/tensor_scatter_nd_update",
               "org.tensorflow.op.Ops#tensorScatterNdUpdate");
+
   protected final JavaDocNodeRendererContext context;
   private final JavaDocWriter writer;
   private boolean firstParagraph;
diff --git a/tensorflow-core/tensorflow-core-native/pom.xml b/tensorflow-core/tensorflow-core-native/pom.xml
index 066ca12be97..c20f219659d 100644
--- a/tensorflow-core/tensorflow-core-native/pom.xml
+++ b/tensorflow-core/tensorflow-core-native/pom.xml
@@ -150,23 +150,23 @@
                 <configuration>
                   <artifacts>
                     <artifact>
-                      <file>${project.build.directory}/${artifactId}-${project.version}-${javacpp.platform.linux-x86_64}.jar</file>
+                      <file>${project.build.directory}/${project.artifactId}-${project.version}-${javacpp.platform.linux-x86_64}.jar</file>
                       <classifier>${javacpp.platform.linux-x86_64}</classifier>
                     </artifact>
                     <artifact>
-                      <file>${project.build.directory}/${artifactId}-${project.version}-${javacpp.platform.linux-x86_64}-gpu.jar</file>
+                      <file>${project.build.directory}/${project.artifactId}-${project.version}-${javacpp.platform.linux-x86_64}-gpu.jar</file>
                       <classifier>${javacpp.platform.linux-x86_64}-gpu</classifier>
                     </artifact>
                     <artifact>
-                      <file>${project.build.directory}/${artifactId}-${project.version}-${javacpp.platform.macosx-arm64}.jar</file>
+                      <file>${project.build.directory}/${project.artifactId}-${project.version}-${javacpp.platform.macosx-arm64}.jar</file>
                       <classifier>${javacpp.platform.macosx-arm64}</classifier>
                     </artifact>
                     <artifact>
-                      <file>${project.build.directory}/${artifactId}-${project.version}-${javacpp.platform.macosx-x86_64}.jar</file>
+                      <file>${project.build.directory}/${project.artifactId}-${project.version}-${javacpp.platform.macosx-x86_64}.jar</file>
                       <classifier>${javacpp.platform.macosx-x86_64}</classifier>
                     </artifact>
                     <artifact>
-                      <file>${project.build.directory}/${artifactId}-${project.version}-${javacpp.platform.windows-x86_64}.jar</file>
+                      <file>${project.build.directory}/${project.artifactId}-${project.version}-${javacpp.platform.windows-x86_64}.jar</file>
                       <classifier>${javacpp.platform.windows-x86_64}</classifier>
                     </artifact>
                   </artifacts>
@@ -530,6 +530,11 @@
               <goal>jar</goal>
             </goals>
             <configuration>
+              <archive>
+                <manifestEntries>
+                  <Automatic-Module-Name>tensorflow.nativelib.${os.name}.${os.arch}</Automatic-Module-Name>
+                </manifestEntries>
+              </archive>
               <classifier>${native.classifier}</classifier>
               <skipIfEmpty>true</skipIfEmpty>
               <includes>
diff --git a/tensorflow-core/tensorflow-core-platform/pom.xml b/tensorflow-core/tensorflow-core-platform/pom.xml
index 8da78e44c86..5ed680a8bf2 100644
--- a/tensorflow-core/tensorflow-core-platform/pom.xml
+++ b/tensorflow-core/tensorflow-core-platform/pom.xml
@@ -41,25 +41,25 @@
       <groupId>org.tensorflow</groupId>
       <artifactId>tensorflow-core-native</artifactId>
       <version>${project.version}</version>
-      <classifier>${javacpp.platform.linux-x86_64.extension}</classifier>
+      <classifier>linux-x86_64</classifier>
     </dependency>
     <dependency>
       <groupId>org.tensorflow</groupId>
       <artifactId>tensorflow-core-native</artifactId>
       <version>${project.version}</version>
-      <classifier>${javacpp.platform.macosx-arm64.extension}</classifier>
+      <classifier>macosx-arm64</classifier>
     </dependency>
     <dependency>
       <groupId>org.tensorflow</groupId>
       <artifactId>tensorflow-core-native</artifactId>
       <version>${project.version}</version>
-      <classifier>${javacpp.platform.macosx-x86_64.extension}</classifier>
+      <classifier>macosx-x86_64</classifier>
     </dependency>
     <dependency>
       <groupId>org.tensorflow</groupId>
       <artifactId>tensorflow-core-native</artifactId>
       <version>${project.version}</version>
-      <classifier>${javacpp.platform.windows-x86_64.extension}</classifier>
+      <classifier>windows-x86_64</classifier>
     </dependency>
   </dependencies>