diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e7dafe762f0d..a7b7358b7f66 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -6,7 +6,7 @@
 ################
 
 # Git Hub integration and bot rules
-/.github/                                       @AlexGhiondea @jsquire
+/.github/                                           @AlexGhiondea @jsquire
 
 ###########
 # SDK
@@ -19,11 +19,15 @@
 # PRLabel: %bom
 /sdk/boms/azure-sdk-bom/                            @pallavit @alzimmermsft @jonathangiles @srnagar @anuchandy
 # PRLabel: %azure-spring
-/sdk/boms/spring-cloud-azure-dependencies/                    @backwind1233 @chenrujun @hui1110 @jialigit @netyyyy @saragluna @stliu @yiliuTo
+/sdk/boms/spring-cloud-azure-dependencies/          @backwind1233 @chenrujun @hui1110 @jialigit @netyyyy @saragluna @stliu @yiliuTo
 
 ####
 # Service teams
 ####
+
+# PRLabel: %AOT
+/sdk/aot/                                           @srnagar @jonathangiles
+
 # PRLabel: %App Configuration
 /sdk/appconfiguration/                              @mssfang @alzimmermsft
 # PRLabel: %azure-spring
diff --git a/sdk/aot/azure-aot-graalvm-samples/pom.xml b/sdk/aot/azure-aot-graalvm-samples/pom.xml
index 5f3e4ff4b340..162295df11b2 100644
--- a/sdk/aot/azure-aot-graalvm-samples/pom.xml
+++ b/sdk/aot/azure-aot-graalvm-samples/pom.xml
@@ -43,6 +43,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- This sample package is not released to maven and revapi checks are not required -->
+        <revapi.skip>true</revapi.skip>
         <legal>
             <![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
     </properties>
diff --git a/sdk/aot/azure-aot-graalvm-support-netty/pom.xml b/sdk/aot/azure-aot-graalvm-support-netty/pom.xml
index 52b7ff463869..ef8099a75d48 100644
--- a/sdk/aot/azure-aot-graalvm-support-netty/pom.xml
+++ b/sdk/aot/azure-aot-graalvm-support-netty/pom.xml
@@ -129,25 +129,76 @@
                 </configuration>
             </plugin>
 
-          <!-- We must generate an empty javadoc JAR file to publish to Maven Central because this package does not contain any public sources -->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
-            <executions>
-              <execution>
-                <id>empty-javadoc-jar</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-                <configuration>
-                  <classifier>javadoc</classifier>
-                  <classesDirectory>${basedir}/javadoc</classesDirectory>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
+            <!-- START: Empty Java Doc -->
+            <!-- The following code will generate an empty javadoc with just a README.md. This is necessary
+                 to pass the required checks on Maven. The way this works is by setting the classesDirectory
+                 to a directory that only contains the README.md, which we need to copy. If the classesDirectory
+                 is set to the root, where the README.md lives, it still won't have javadocs but the jar file
+                 will contain a bunch of files that shouldn't be there. The faux sources directory is deleted
+                 and recreated with the README.md being copied every time to guarantee that, when building locally,
+                 it'll have the latest copy of the README.md file.
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.3.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
+                <executions>
+                    <execution>
+                        <id>empty-javadoc-jar-with-readme</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>javadoc</classifier>
+                            <classesDirectory>${project.basedir}/javadocTemp</classesDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version> <!-- {x-version-update;org.apache.maven.plugins:maven-antrun-plugin;external_dependency} -->
+                <executions>
+                    <execution>
+                        <id>copy-readme-to-javadocTemp</id>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <target>
+                                <echo>Deleting existing ${project.basedir}/javadocTemp</echo>
+                                <delete includeEmptyDirs="true" quiet="true">
+                                    <fileset dir="${project.basedir}/javadocTemp"/>
+                                </delete>
+                                <echo>Copying ${project.basedir}/README.md to
+                                    ${project.basedir}/javadocTemp/README.md
+                                </echo>
+                                <copy file="${project.basedir}/README.md" tofile="${project.basedir}/javadocTemp/README.md"/>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- END: Empty Java Doc -->
         </plugins>
     </build>
 </project>
diff --git a/sdk/aot/azure-aot-graalvm-support/pom.xml b/sdk/aot/azure-aot-graalvm-support/pom.xml
index a9061787782b..90aeb54031be 100644
--- a/sdk/aot/azure-aot-graalvm-support/pom.xml
+++ b/sdk/aot/azure-aot-graalvm-support/pom.xml
@@ -85,25 +85,76 @@
                 </configuration>
             </plugin>
 
-            <!-- We must generate an empty javadoc JAR file to publish to Maven Central because this package does not contain any public sources -->
+            <!-- START: Empty Java Doc -->
+            <!-- The following code will generate an empty javadoc with just a README.md. This is necessary
+                 to pass the required checks on Maven. The way this works is by setting the classesDirectory
+                 to a directory that only contains the README.md, which we need to copy. If the classesDirectory
+                 is set to the root, where the README.md lives, it still won't have javadocs but the jar file
+                 will contain a bunch of files that shouldn't be there. The faux sources directory is deleted
+                 and recreated with the README.md being copied every time to guarantee that, when building locally,
+                 it'll have the latest copy of the README.md file.
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.3.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
                 <executions>
                     <execution>
-                        <id>empty-javadoc-jar</id>
+                        <id>empty-javadoc-jar-with-readme</id>
                         <phase>package</phase>
                         <goals>
                             <goal>jar</goal>
                         </goals>
                         <configuration>
                             <classifier>javadoc</classifier>
-                            <classesDirectory>${basedir}/javadoc</classesDirectory>
+                            <classesDirectory>${project.basedir}/javadocTemp</classesDirectory>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version> <!-- {x-version-update;org.apache.maven.plugins:maven-antrun-plugin;external_dependency} -->
+                <executions>
+                    <execution>
+                        <id>copy-readme-to-javadocTemp</id>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <target>
+                                <echo>Deleting existing ${project.basedir}/javadocTemp</echo>
+                                <delete includeEmptyDirs="true" quiet="true">
+                                    <fileset dir="${project.basedir}/javadocTemp"/>
+                                </delete>
+                                <echo>Copying ${project.basedir}/README.md to
+                                    ${project.basedir}/javadocTemp/README.md
+                                </echo>
+                                <copy file="${project.basedir}/README.md" tofile="${project.basedir}/javadocTemp/README.md"/>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- END: Empty Java Doc -->
         </plugins>
     </build>
 </project>
diff --git a/sdk/aot/ci.yml b/sdk/aot/ci.yml
index 98ef29da0b34..5303ee447a51 100644
--- a/sdk/aot/ci.yml
+++ b/sdk/aot/ci.yml
@@ -40,4 +40,8 @@ extends:
       - name: azure-aot-graalvm-support-netty
         groupId: com.azure
         safeName: azureaotgraalvmsupportnetty
-
+    AdditionalModules:
+      - name: azure-aot-graalvm-samples
+        groupId: com.azure
+      - name: azure-aot-graalvm-perf
+        groupId: com.azure