diff --git a/a2a/pom.xml b/a2a/pom.xml
index 61af36ef..35b0651b 100644
--- a/a2a/pom.xml
+++ b/a2a/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.google.adk</groupId>
     <artifactId>google-adk-parent</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
   </parent>
 
   <artifactId>google-adk-a2a</artifactId>
diff --git a/a2a/webservice/pom.xml b/a2a/webservice/pom.xml
index b929afab..dd723aa7 100644
--- a/a2a/webservice/pom.xml
+++ b/a2a/webservice/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.google.adk</groupId>
     <artifactId>google-adk-parent</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
   </parent>
 
   <artifactId>google-adk-a2a-webservice</artifactId>
diff --git a/contrib/samples/a2a_basic/pom.xml b/contrib/samples/a2a_basic/pom.xml
index b4618b20..59e10c37 100644
--- a/contrib/samples/a2a_basic/pom.xml
+++ b/contrib/samples/a2a_basic/pom.xml
@@ -4,9 +4,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.google.adk</groupId>
+  <parent>
+    <groupId>com.google.adk</groupId>
+    <artifactId>google-adk-samples</artifactId>
+    <version>0.3.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+    <relativePath>..</relativePath>
+  </parent>
+
   <artifactId>google-adk-sample-a2a-basic</artifactId>
-  <version>0.3.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Google ADK - Sample - A2A Basic Client</name>
@@ -15,8 +20,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <java.version>17</java.version>
-    <google-adk.version>0.3.1-SNAPSHOT</google-adk.version>
-    <google-adk-a2a.version>0.3.1-SNAPSHOT</google-adk-a2a.version>
+    <google-adk.version>${project.version}</google-adk.version>
+    <google-adk-a2a.version>${project.version}</google-adk-a2a.version>
     <slf4j.version>2.0.16</slf4j.version>
   </properties>
 
@@ -69,6 +74,16 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/*.jar</exclude>
+            <exclude>target/**</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
diff --git a/contrib/samples/a2a_remote/pom.xml b/contrib/samples/a2a_remote/pom.xml
index 26bb6ff1..ee65bdde 100644
--- a/contrib/samples/a2a_remote/pom.xml
+++ b/contrib/samples/a2a_remote/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.google.adk</groupId>
     <artifactId>google-adk-parent</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
   </parent>
 
   <artifactId>google-adk-sample-a2a-remote</artifactId>
@@ -114,6 +114,16 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/*.jar</exclude>
+            <exclude>target/**</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
diff --git a/contrib/samples/configagent/pom.xml b/contrib/samples/configagent/pom.xml
index 981a1eac..510270c5 100644
--- a/contrib/samples/configagent/pom.xml
+++ b/contrib/samples/configagent/pom.xml
@@ -2,16 +2,22 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <parent>
+        <groupId>com.google.adk</groupId>
+        <artifactId>google-adk-samples</artifactId>
+        <version>0.3.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+        <relativePath>..</relativePath>
+    </parent>
+
     <groupId>com.google.adk.samples</groupId>
     <artifactId>configagent-samples</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <google-adk.version>0.3.0</google-adk.version>
+        <google-adk.version>${project.version}</google-adk.version>
     </properties>
 
     <dependencies>
diff --git a/contrib/samples/helloworld/pom.xml b/contrib/samples/helloworld/pom.xml
index ed6c6a09..96b50500 100644
--- a/contrib/samples/helloworld/pom.xml
+++ b/contrib/samples/helloworld/pom.xml
@@ -17,9 +17,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <parent>
+        <groupId>com.google.adk</groupId>
+        <artifactId>google-adk-samples</artifactId>
+        <version>0.3.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+        <relativePath>..</relativePath>
+    </parent>
+
     <groupId>com.google.adk.samples</groupId>
     <artifactId>google-adk-sample-helloworld</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
     <name>Google ADK - Sample - Hello World</name>
     <description>
         A sample "Hello World" application demonstrating basic agent and tool usage with the Google ADK,
@@ -33,7 +39,7 @@
         <auto-value.version>1.11.0</auto-value.version>
         <!-- Main class for exec-maven-plugin -->
         <exec.mainClass>com.example.helloworld.HelloWorldRun</exec.mainClass>
-        <google-adk.version>0.3.0</google-adk.version>
+        <google-adk.version>${project.version}</google-adk.version>
     </properties>
 
     <dependencies>
@@ -80,6 +86,16 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*.jar</exclude>
+                        <exclude>target/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
diff --git a/contrib/samples/mcpfilesystem/pom.xml b/contrib/samples/mcpfilesystem/pom.xml
index 801ff5e1..f81910ae 100644
--- a/contrib/samples/mcpfilesystem/pom.xml
+++ b/contrib/samples/mcpfilesystem/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.google.adk</groupId>
         <artifactId>google-adk-parent</artifactId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
         <relativePath>../../..</relativePath>
     </parent>
 
@@ -85,6 +85,16 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*.jar</exclude>
+                        <exclude>target/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
diff --git a/contrib/samples/pom.xml b/contrib/samples/pom.xml
index 371fec6c..5e442daf 100644
--- a/contrib/samples/pom.xml
+++ b/contrib/samples/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.google.adk</groupId>
     <artifactId>google-adk-parent</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/maven_plugin/examples/custom_tools/pom.xml b/maven_plugin/examples/custom_tools/pom.xml
index b663d75f..4e55b828 100644
--- a/maven_plugin/examples/custom_tools/pom.xml
+++ b/maven_plugin/examples/custom_tools/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.example</groupId>
     <artifactId>custom-tools-example</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
     <packaging>jar</packaging>
 
     <name>ADK Custom Tools Example</name>
@@ -16,7 +16,7 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <google-adk.version>0.3.1-SNAPSHOT</google-adk.version>
+        <google-adk.version>${project.version}</google-adk.version>
     </properties>
 
     <dependencies>
@@ -58,4 +58,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven_plugin/examples/simple-agent/pom.xml b/maven_plugin/examples/simple-agent/pom.xml
index a4cc5aeb..d4e247f5 100644
--- a/maven_plugin/examples/simple-agent/pom.xml
+++ b/maven_plugin/examples/simple-agent/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.example</groupId>
     <artifactId>simple-adk-agent</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
     <packaging>jar</packaging>
 
     <name>Simple ADK Agent Example</name>
@@ -16,7 +16,7 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <google-adk.version>0.3.1-SNAPSHOT</google-adk.version>
+        <google-adk.version>${project.version}</google-adk.version>
     </properties>
 
     <dependencies>
@@ -62,4 +62,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven_plugin/pom.xml b/maven_plugin/pom.xml
index 416b68f3..d0f63a4c 100644
--- a/maven_plugin/pom.xml
+++ b/maven_plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.google.adk</groupId>
         <artifactId>google-adk-parent</artifactId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -185,4 +185,4 @@
 
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>