diff --git a/assembly/ui/pom.xml b/assembly/ui/pom.xml
index 4a6acd420ce..d519506b56f 100644
--- a/assembly/ui/pom.xml
+++ b/assembly/ui/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/assembly/utils/pom.xml b/assembly/utils/pom.xml
index 7ae394e7680..00a59592de4 100644
--- a/assembly/utils/pom.xml
+++ b/assembly/utils/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/assembly/zms/pom.xml b/assembly/zms/pom.xml
index b49c70fd05c..5291d6686af 100644
--- a/assembly/zms/pom.xml
+++ b/assembly/zms/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/assembly/zpu/pom.xml b/assembly/zpu/pom.xml
index 9dafdf8291c..3674efa1b24 100644
--- a/assembly/zpu/pom.xml
+++ b/assembly/zpu/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/assembly/zts/pom.xml b/assembly/zts/pom.xml
index 3c3eb7f6952..8fb5fb56b1f 100644
--- a/assembly/zts/pom.xml
+++ b/assembly/zts/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/aws-setup/athenz-conf-aws/pom.xml b/aws-setup/athenz-conf-aws/pom.xml
index ec3df9a0a4e..75e4ee60a56 100755
--- a/aws-setup/athenz-conf-aws/pom.xml
+++ b/aws-setup/athenz-conf-aws/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.yahoo.athenz</groupId>
         <artifactId>athenz</artifactId>
-        <version>1.8.18-SNAPSHOT</version>
+        <version>1.8.18</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/clients/go/zms/pom.xml b/clients/go/zms/pom.xml
index 6a745574004..3c29b77e7a1 100644
--- a/clients/go/zms/pom.xml
+++ b/clients/go/zms/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/clients/go/zts/pom.xml b/clients/go/zts/pom.xml
index 6cb65c58da3..b178199866a 100644
--- a/clients/go/zts/pom.xml
+++ b/clients/go/zts/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/clients/java/zms/pom.xml b/clients/java/zms/pom.xml
index bd5e323dc5a..0585596242e 100644
--- a/clients/java/zms/pom.xml
+++ b/clients/java/zms/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/clients/java/zpe/pom.xml b/clients/java/zpe/pom.xml
index 0891ca09ef6..436145042d8 100644
--- a/clients/java/zpe/pom.xml
+++ b/clients/java/zpe/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/clients/java/zts/core/pom.xml b/clients/java/zts/core/pom.xml
index aebe17bc15f..0a12d035cd6 100644
--- a/clients/java/zts/core/pom.xml
+++ b/clients/java/zts/core/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../../../pom.xml</relativePath>
   </parent>
 
diff --git a/clients/java/zts/shade/pom.xml b/clients/java/zts/shade/pom.xml
index 11454c3c010..e2c94b22ac6 100644
--- a/clients/java/zts/shade/pom.xml
+++ b/clients/java/zts/shade/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../../../pom.xml</relativePath>
   </parent>
 
diff --git a/clients/nodejs/zpe/pom.xml b/clients/nodejs/zpe/pom.xml
index a20676e98f3..46d2093e438 100644
--- a/clients/nodejs/zpe/pom.xml
+++ b/clients/nodejs/zpe/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/clients/nodejs/zts/pom.xml b/clients/nodejs/zts/pom.xml
index ef860dfbd2b..209611a6285 100644
--- a/clients/nodejs/zts/pom.xml
+++ b/clients/nodejs/zts/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/containers/jetty/pom.xml b/containers/jetty/pom.xml
index e4ca1362159..21069cf000b 100644
--- a/containers/jetty/pom.xml
+++ b/containers/jetty/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/core/zms/pom.xml b/core/zms/pom.xml
index 1ff18106edd..13774f130cb 100644
--- a/core/zms/pom.xml
+++ b/core/zms/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/core/zts/pom.xml b/core/zts/pom.xml
index f9a65db9936..0734b0c1131 100644
--- a/core/zts/pom.xml
+++ b/core/zts/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/go/athenzconf/pom.xml b/libs/go/athenzconf/pom.xml
index 47cfe9d99ac..a1ab3642d28 100644
--- a/libs/go/athenzconf/pom.xml
+++ b/libs/go/athenzconf/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/go/athenzutils/pom.xml b/libs/go/athenzutils/pom.xml
index 761841a49cd..e46c16f4b4e 100644
--- a/libs/go/athenzutils/pom.xml
+++ b/libs/go/athenzutils/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/go/zmscli/pom.xml b/libs/go/zmscli/pom.xml
index 9a3ce19a794..66c6088aac4 100644
--- a/libs/go/zmscli/pom.xml
+++ b/libs/go/zmscli/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/go/zmssvctoken/pom.xml b/libs/go/zmssvctoken/pom.xml
index bf8945929fd..949d517f998 100644
--- a/libs/go/zmssvctoken/pom.xml
+++ b/libs/go/zmssvctoken/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/java/auth_core/pom.xml b/libs/java/auth_core/pom.xml
index de01a2f3027..60bb0405302 100644
--- a/libs/java/auth_core/pom.xml
+++ b/libs/java/auth_core/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/java/cert_refresher/pom.xml b/libs/java/cert_refresher/pom.xml
index 07a583cdae5..a5f160c1088 100644
--- a/libs/java/cert_refresher/pom.xml
+++ b/libs/java/cert_refresher/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/java/client_common/pom.xml b/libs/java/client_common/pom.xml
index 9619f5c29e3..c4b84f21a9d 100644
--- a/libs/java/client_common/pom.xml
+++ b/libs/java/client_common/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/java/instance_provider/pom.xml b/libs/java/instance_provider/pom.xml
index 23edd4adeb6..4e064a327dc 100644
--- a/libs/java/instance_provider/pom.xml
+++ b/libs/java/instance_provider/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/java/server_common/pom.xml b/libs/java/server_common/pom.xml
index d6f4acee7b0..a9e313157c2 100644
--- a/libs/java/server_common/pom.xml
+++ b/libs/java/server_common/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/nodejs/auth_core/pom.xml b/libs/nodejs/auth_core/pom.xml
index edfeff72be3..6fefc9b6ea5 100644
--- a/libs/nodejs/auth_core/pom.xml
+++ b/libs/nodejs/auth_core/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 9d398e0ec23..d3a034ad106 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <groupId>com.yahoo.athenz</groupId>
   <artifactId>athenz</artifactId>
   <packaging>pom</packaging>
-  <version>1.8.18-SNAPSHOT</version>
+  <version>1.8.18</version>
 
   <name>AthenZ</name>
   <description>
@@ -55,7 +55,7 @@
   <scm>
     <url>https://github.com/yahoo/athenz</url>
     <connection>scm:git:https://github.com/yahoo/athenz.git</connection>
-    <tag>HEAD</tag>
+    <tag>v1.8.18</tag>
   </scm>
 
   <issueManagement>
diff --git a/rdl/rdl-gen-athenz-server/pom.xml b/rdl/rdl-gen-athenz-server/pom.xml
index f9bc4ad7b94..78909fe0543 100644
--- a/rdl/rdl-gen-athenz-server/pom.xml
+++ b/rdl/rdl-gen-athenz-server/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/servers/zms/pom.xml b/servers/zms/pom.xml
index c3aece8fa43..722f4531c5a 100644
--- a/servers/zms/pom.xml
+++ b/servers/zms/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/servers/zts/pom.xml b/servers/zts/pom.xml
index 6fd934d6db3..126307c2bd3 100644
--- a/servers/zts/pom.xml
+++ b/servers/zts/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/ui/pom.xml b/ui/pom.xml
index f59cca6f15a..8d43c7db295 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/utils/athenz-conf/pom.xml b/utils/athenz-conf/pom.xml
index 8929b83a905..b7a0438b1f5 100644
--- a/utils/athenz-conf/pom.xml
+++ b/utils/athenz-conf/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/utils/zms-cli/pom.xml b/utils/zms-cli/pom.xml
index 1bf41d77e43..79e84c5d5f2 100644
--- a/utils/zms-cli/pom.xml
+++ b/utils/zms-cli/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/utils/zms-svctoken/pom.xml b/utils/zms-svctoken/pom.xml
index b6b0b35fc46..870b3f802b8 100644
--- a/utils/zms-svctoken/pom.xml
+++ b/utils/zms-svctoken/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/utils/zpe-updater/pom.xml b/utils/zpe-updater/pom.xml
index 83e025d897a..352f01a6c8d 100644
--- a/utils/zpe-updater/pom.xml
+++ b/utils/zpe-updater/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/utils/zpe_policy_updater/pom.xml b/utils/zpe_policy_updater/pom.xml
index d3a4044b7f9..8ca02ce684b 100644
--- a/utils/zpe_policy_updater/pom.xml
+++ b/utils/zpe_policy_updater/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/utils/zts-rolecert/pom.xml b/utils/zts-rolecert/pom.xml
index 62517a316cf..c0a6163cc30 100644
--- a/utils/zts-rolecert/pom.xml
+++ b/utils/zts-rolecert/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/utils/zts-roletoken/pom.xml b/utils/zts-roletoken/pom.xml
index f47839f0b59..bd0c120742d 100644
--- a/utils/zts-roletoken/pom.xml
+++ b/utils/zts-roletoken/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/utils/zts-svccert/pom.xml b/utils/zts-svccert/pom.xml
index dbb43577c5f..8af97880e6c 100644
--- a/utils/zts-svccert/pom.xml
+++ b/utils/zts-svccert/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.18-SNAPSHOT</version>
+    <version>1.8.18</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>