diff --git a/assembly/ui/pom.xml b/assembly/ui/pom.xml
index 8f63c21349c..127afac6145 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/assembly/utils/pom.xml b/assembly/utils/pom.xml
index 39c06270967..4b42876ec5e 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/assembly/zms/pom.xml b/assembly/zms/pom.xml
index e7329f4cb6e..c955864c134 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/assembly/zpu/pom.xml b/assembly/zpu/pom.xml
index 5a47028e31a..e92d4280e8c 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/assembly/zts/pom.xml b/assembly/zts/pom.xml
index 9ac4fa03903..21387bfa9a9 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.21-SNAPSHOT</version>
+    <version>1.8.21</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 a447d1f0ee2..90eb2f1c322 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.21-SNAPSHOT</version>
+        <version>1.8.21</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/clients/go/zms/pom.xml b/clients/go/zms/pom.xml
index 690bb4cbe1e..f068a5b0612 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/clients/go/zts/pom.xml b/clients/go/zts/pom.xml
index e95b0d42445..f9419e1690d 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/clients/java/zms/pom.xml b/clients/java/zms/pom.xml
index 252127aace8..1164ee7138b 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/clients/java/zpe/pom.xml b/clients/java/zpe/pom.xml
index 91f621ca882..aefbc3ca371 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/clients/java/zts/core/pom.xml b/clients/java/zts/core/pom.xml
index 3931df7f608..550bf5a2740 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../../../pom.xml</relativePath>
   </parent>
 
diff --git a/clients/java/zts/shade/pom.xml b/clients/java/zts/shade/pom.xml
index a89e09d2a7b..001345c34fb 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../../../pom.xml</relativePath>
   </parent>
 
diff --git a/clients/nodejs/zpe/pom.xml b/clients/nodejs/zpe/pom.xml
index ac784670d83..b5091bb09f4 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/clients/nodejs/zts/pom.xml b/clients/nodejs/zts/pom.xml
index 41397256fbd..58bb66c5c4f 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/containers/jetty/pom.xml b/containers/jetty/pom.xml
index fb05b16b1cb..5f8ebdb0130 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/core/zms/pom.xml b/core/zms/pom.xml
index c0e9124022d..3cebb8330ec 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/core/zts/pom.xml b/core/zts/pom.xml
index 651f071a745..41ae603ac9b 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/go/athenzconf/pom.xml b/libs/go/athenzconf/pom.xml
index 1b9fbb31f42..4a531f172e4 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/go/athenzutils/pom.xml b/libs/go/athenzutils/pom.xml
index 5109972c744..f40cae2c53d 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/go/zmscli/pom.xml b/libs/go/zmscli/pom.xml
index b7c72ef51c0..55d78bfbced 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/go/zmssvctoken/pom.xml b/libs/go/zmssvctoken/pom.xml
index 0c159d53ad4..e325ebd887e 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/java/auth_core/pom.xml b/libs/java/auth_core/pom.xml
index 54f8433cb62..0b23bb65aab 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/java/cert_refresher/pom.xml b/libs/java/cert_refresher/pom.xml
index c40e56622dc..7f63a57a4bd 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/java/client_common/pom.xml b/libs/java/client_common/pom.xml
index c72cc13bfe7..df7a5af1efa 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/java/instance_provider/pom.xml b/libs/java/instance_provider/pom.xml
index 54894e7372b..91417731365 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/java/server_common/pom.xml b/libs/java/server_common/pom.xml
index 015133ba707..fe97ef3b741 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/libs/nodejs/auth_core/pom.xml b/libs/nodejs/auth_core/pom.xml
index 11e84a0dea4..9e07973db14 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 321deec14ff..66378d55b14 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.21-SNAPSHOT</version>
+  <version>1.8.21</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.21</tag>
   </scm>
 
   <issueManagement>
diff --git a/rdl/rdl-gen-athenz-go-client/pom.xml b/rdl/rdl-gen-athenz-go-client/pom.xml
index 5400d619988..2f7adc96e26 100644
--- a/rdl/rdl-gen-athenz-go-client/pom.xml
+++ b/rdl/rdl-gen-athenz-go-client/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/rdl/rdl-gen-athenz-server/pom.xml b/rdl/rdl-gen-athenz-server/pom.xml
index c43166eb517..2361fd260b0 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/servers/zms/pom.xml b/servers/zms/pom.xml
index 3902103013f..824149903ed 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/servers/zts/pom.xml b/servers/zts/pom.xml
index d88a69051f1..34b9e27f0ec 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/ui/pom.xml b/ui/pom.xml
index c208d77c790..8ef6324654f 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/utils/athenz-conf/pom.xml b/utils/athenz-conf/pom.xml
index 5a37704188c..8834e5fad3a 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/utils/zms-cli/pom.xml b/utils/zms-cli/pom.xml
index ea81b474734..ab8723bfa61 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/utils/zms-svctoken/pom.xml b/utils/zms-svctoken/pom.xml
index 2d839ca422d..dee9173c04b 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/utils/zpe-updater/pom.xml b/utils/zpe-updater/pom.xml
index 58db78b0ae3..9a6413a64c5 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/utils/zpe_policy_updater/pom.xml b/utils/zpe_policy_updater/pom.xml
index 29b8dc04740..b5ad027e1d4 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/utils/zts-accesstoken/pom.xml b/utils/zts-accesstoken/pom.xml
index 5a2dcdc108a..b78d5ca75ac 100644
--- a/utils/zts-accesstoken/pom.xml
+++ b/utils/zts-accesstoken/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.yahoo.athenz</groupId>
     <artifactId>athenz</artifactId>
-    <version>1.8.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/utils/zts-rolecert/pom.xml b/utils/zts-rolecert/pom.xml
index 935e7c347d7..0ac1469ce8d 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/utils/zts-roletoken/pom.xml b/utils/zts-roletoken/pom.xml
index 3ecd70a4588..e6bd15fc33a 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/utils/zts-svccert/pom.xml b/utils/zts-svccert/pom.xml
index 78ea8da130c..458057bf11a 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.21-SNAPSHOT</version>
+    <version>1.8.21</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>