diff --git a/.gitignore b/.gitignore
index 3cb2a5de8..04034b709 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,6 @@ contrib/samples/**/bin/
 mkpro_logs.db
 
 
+
+# flatten-maven-plugin
+.flattened-pom.xml
\ No newline at end of file
diff --git a/a2a/pom.xml b/a2a/pom.xml
index 7a60e241b..2c8873439 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>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+    <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
   </parent>
 
   <artifactId>google-adk-a2a</artifactId>
diff --git a/contrib/firestore-session-service/pom.xml b/contrib/firestore-session-service/pom.xml
index 40493453d..6979e1590 100644
--- a/contrib/firestore-session-service/pom.xml
+++ b/contrib/firestore-session-service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.google.adk</groupId>
         <artifactId>google-adk-parent</artifactId>
-        <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+        <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/contrib/langchain4j/pom.xml b/contrib/langchain4j/pom.xml
index 848cf711a..0f4c3b07e 100644
--- a/contrib/langchain4j/pom.xml
+++ b/contrib/langchain4j/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.google.adk</groupId>
         <artifactId>google-adk-parent</artifactId>
-        <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+        <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/contrib/planners/pom.xml b/contrib/planners/pom.xml
index 5a614a752..e842f725c 100644
--- a/contrib/planners/pom.xml
+++ b/contrib/planners/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.google.adk</groupId>
         <artifactId>google-adk-parent</artifactId>
-        <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+        <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/contrib/samples/a2a_basic/pom.xml b/contrib/samples/a2a_basic/pom.xml
index 89a3286e9..d584ddf0c 100644
--- a/contrib/samples/a2a_basic/pom.xml
+++ b/contrib/samples/a2a_basic/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.google.adk</groupId>
     <artifactId>google-adk-samples</artifactId>
-    <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+    <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/contrib/samples/a2a_server/pom.xml b/contrib/samples/a2a_server/pom.xml
index b117671f4..b9715dc1c 100644
--- a/contrib/samples/a2a_server/pom.xml
+++ b/contrib/samples/a2a_server/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.google.adk</groupId>
     <artifactId>google-adk-samples</artifactId>
-    <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+    <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/contrib/samples/configagent/pom.xml b/contrib/samples/configagent/pom.xml
index d8fc4c800..cd29a67c6 100644
--- a/contrib/samples/configagent/pom.xml
+++ b/contrib/samples/configagent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.google.adk</groupId>
         <artifactId>google-adk-samples</artifactId>
-        <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+        <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/contrib/samples/github/adkprtriaging/pom.xml b/contrib/samples/github/adkprtriaging/pom.xml
index 8606e9f0f..78e9e5473 100644
--- a/contrib/samples/github/adkprtriaging/pom.xml
+++ b/contrib/samples/github/adkprtriaging/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.google.adk</groupId>
         <artifactId>google-adk-samples</artifactId>
-        <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+        <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/contrib/samples/github/adkreleasedocs/pom.xml b/contrib/samples/github/adkreleasedocs/pom.xml
index 5ca5a6289..0ca97ad19 100644
--- a/contrib/samples/github/adkreleasedocs/pom.xml
+++ b/contrib/samples/github/adkreleasedocs/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.google.adk</groupId>
         <artifactId>google-adk-samples</artifactId>
-        <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+        <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/contrib/samples/github/adkspam/pom.xml b/contrib/samples/github/adkspam/pom.xml
index bcaa373b7..74b6aa3cd 100644
--- a/contrib/samples/github/adkspam/pom.xml
+++ b/contrib/samples/github/adkspam/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.google.adk</groupId>
         <artifactId>google-adk-samples</artifactId>
-        <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+        <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/contrib/samples/github/adkstale/pom.xml b/contrib/samples/github/adkstale/pom.xml
index dffb43090..118a4bb33 100644
--- a/contrib/samples/github/adkstale/pom.xml
+++ b/contrib/samples/github/adkstale/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.google.adk</groupId>
         <artifactId>google-adk-samples</artifactId>
-        <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+        <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/contrib/samples/github/adktriaging/pom.xml b/contrib/samples/github/adktriaging/pom.xml
index e5254e173..059ba5fed 100644
--- a/contrib/samples/github/adktriaging/pom.xml
+++ b/contrib/samples/github/adktriaging/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.google.adk</groupId>
         <artifactId>google-adk-samples</artifactId>
-        <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+        <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/contrib/samples/github/githubtools/pom.xml b/contrib/samples/github/githubtools/pom.xml
index 236fdeb06..770586a4f 100644
--- a/contrib/samples/github/githubtools/pom.xml
+++ b/contrib/samples/github/githubtools/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.google.adk</groupId>
         <artifactId>google-adk-samples</artifactId>
-        <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+        <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/contrib/samples/helloworld/pom.xml b/contrib/samples/helloworld/pom.xml
index 9412f791f..1e504c1b3 100644
--- a/contrib/samples/helloworld/pom.xml
+++ b/contrib/samples/helloworld/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.google.adk</groupId>
         <artifactId>google-adk-samples</artifactId>
-        <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+        <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/contrib/samples/mcpfilesystem/pom.xml b/contrib/samples/mcpfilesystem/pom.xml
index 501d2e9d1..0a2106d7d 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>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+        <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
         <relativePath>../../..</relativePath>
     </parent>
 
diff --git a/contrib/samples/pom.xml b/contrib/samples/pom.xml
index ae54d0cd6..300b11f15 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>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+    <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/contrib/sarvam-ai/pom.xml b/contrib/sarvam-ai/pom.xml
index 804a3081e..310946ad9 100644
--- a/contrib/sarvam-ai/pom.xml
+++ b/contrib/sarvam-ai/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.google.adk</groupId>
         <artifactId>google-adk-parent</artifactId>
-        <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+        <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/contrib/spring-ai/pom.xml b/contrib/spring-ai/pom.xml
index c8685aeef..e44dff62f 100644
--- a/contrib/spring-ai/pom.xml
+++ b/contrib/spring-ai/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.google.adk</groupId>
         <artifactId>google-adk-parent</artifactId>
-        <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+        <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/core/pom.xml b/core/pom.xml
index 454b7509a..243e4ae42 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.google.adk</groupId>
     <artifactId>google-adk-parent</artifactId>
-    <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+    <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
   </parent>
 
   <artifactId>google-adk</artifactId>
diff --git a/dev/pom.xml b/dev/pom.xml
index 737b5c2ca..737597b05 100644
--- a/dev/pom.xml
+++ b/dev/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>com.google.adk</groupId>
     <artifactId>google-adk-parent</artifactId>
-    <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+    <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
   </parent>
 
   <artifactId>google-adk-dev</artifactId>
diff --git a/maven_plugin/examples/custom_tools/pom.xml b/maven_plugin/examples/custom_tools/pom.xml
index ff7c0ee4b..9ac93932e 100644
--- a/maven_plugin/examples/custom_tools/pom.xml
+++ b/maven_plugin/examples/custom_tools/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.example</groupId>
     <artifactId>custom-tools-example</artifactId>
-    <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+    <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
     <packaging>jar</packaging>
 
     <name>ADK Custom Tools Example</name>
diff --git a/maven_plugin/examples/simple-agent/pom.xml b/maven_plugin/examples/simple-agent/pom.xml
index b2b4ccd71..fcdfa0a56 100644
--- a/maven_plugin/examples/simple-agent/pom.xml
+++ b/maven_plugin/examples/simple-agent/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.example</groupId>
     <artifactId>simple-adk-agent</artifactId>
-    <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+    <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
     <packaging>jar</packaging>
 
     <name>Simple ADK Agent Example</name>
diff --git a/maven_plugin/pom.xml b/maven_plugin/pom.xml
index 8dbdabb1e..6715e7c48 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>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+        <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index a89c6790e..04630c937 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 
   <groupId>com.google.adk</groupId>
   <artifactId>google-adk-parent</artifactId>
-  <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+  <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
   <packaging>pom</packaging>
 
   <name>Google Agent Development Kit Maven Parent POM</name>
@@ -40,6 +40,7 @@
   </modules>
 
   <properties>
+    <revision>1.6.1-SNAPSHOT</revision><!-- {x-version-update:google-adk:current} -->
     <java.version>17</java.version>
     <maven.compiler.release>${java.version}</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -489,6 +490,31 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+        <version>1.6.0</version>
+        <configuration>
+          <updatePomFile>true</updatePomFile>
+          <flattenMode>resolveCiFriendliesOnly</flattenMode>
+        </configuration>
+        <executions>
+          <execution>
+            <id>flatten</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>flatten</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>flatten-clean</id>
+            <phase>clean</phase>
+            <goals>
+              <goal>clean</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <profiles>
diff --git a/tutorials/city-time-weather/pom.xml b/tutorials/city-time-weather/pom.xml
index 2dfd23bbc..fba6538bb 100644
--- a/tutorials/city-time-weather/pom.xml
+++ b/tutorials/city-time-weather/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.google.adk</groupId>
     <artifactId>google-adk-parent</artifactId>
-    <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+    <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/tutorials/live-audio-single-agent/pom.xml b/tutorials/live-audio-single-agent/pom.xml
index b4c2e5cfa..7a361a91e 100644
--- a/tutorials/live-audio-single-agent/pom.xml
+++ b/tutorials/live-audio-single-agent/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.google.adk</groupId>
     <artifactId>google-adk-parent</artifactId>
-    <version>1.6.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
+    <version>${revision}</version><!-- {x-version-update:google-adk:current} -->
     <relativePath>../../pom.xml</relativePath>
   </parent>