diff --git a/pom.xml b/pom.xml
index e767be7f..22df597d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <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>
   <artifactId>client</artifactId>
-  <version>3.8.4-SNAPSHOT</version>
+  <version>3.8.4</version>
   <name>Zanata client modules</name>
   <packaging>pom</packaging>
   <parent>
@@ -16,7 +16,7 @@
     <connection>scm:git:git://github.com/zanata/zanata-client.git</connection>
     <developerConnection>scm:git:git@github.com:zanata/zanata-client.git</developerConnection>
     <url>https://github.com/zanata/zanata-client</url>
-    <tag>HEAD</tag>
+    <tag>client-3.8.4</tag>
   </scm>
 
   <!-- This is needed for bootstrapping with a zanata-parent SNAPSHOT  -->
diff --git a/stub-server/pom.xml b/stub-server/pom.xml
index f42f9872..0cef738d 100644
--- a/stub-server/pom.xml
+++ b/stub-server/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>client</artifactId>
-    <version>3.8.4-SNAPSHOT</version>
+    <version>3.8.4</version>
   </parent>
   <artifactId>stub-server</artifactId>
   <name>stub-server</name>
@@ -14,7 +14,7 @@
     <connection>scm:git:git://github.com/zanata/zanata-client.git</connection>
     <developerConnection>scm:git:git@github.com:zanata/zanata-client.git</developerConnection>
     <url>https://github.com/zanata/zanata-client</url>
-    <tag>HEAD</tag>
+    <tag>client-3.8.4</tag>
   </scm>
 
   <properties>
diff --git a/zanata-cli/pom.xml b/zanata-cli/pom.xml
index 9533a972..a506faf1 100644
--- a/zanata-cli/pom.xml
+++ b/zanata-cli/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>client</artifactId>
-    <version>3.8.4-SNAPSHOT</version>
+    <version>3.8.4</version>
   </parent>
   <artifactId>zanata-cli</artifactId>
   <name>Zanata command-line client</name>
@@ -14,7 +14,7 @@
     <connection>scm:git:git://github.com/zanata/zanata-client.git</connection>
     <developerConnection>scm:git:git@github.com:zanata/zanata-client.git</developerConnection>
     <url>https://github.com/zanata/zanata-client</url>
-    <tag>HEAD</tag>
+    <tag>client-3.8.4</tag>
   </scm>
 
   <build>
diff --git a/zanata-client-commands/pom.xml b/zanata-client-commands/pom.xml
index b1b90197..d1a56d66 100644
--- a/zanata-client-commands/pom.xml
+++ b/zanata-client-commands/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>client</artifactId>
-    <version>3.8.4-SNAPSHOT</version>
+    <version>3.8.4</version>
   </parent>
   <artifactId>zanata-client-commands</artifactId>
   <name>Zanata client commands</name>
@@ -14,7 +14,7 @@
     <connection>scm:git:git://github.com/zanata/zanata-client.git</connection>
     <developerConnection>scm:git:git@github.com:zanata/zanata-client.git</developerConnection>
     <url>https://github.com/zanata/zanata-client</url>
-    <tag>HEAD</tag>
+    <tag>client-3.8.4</tag>
   </scm>
 
   <dependencies>
diff --git a/zanata-maven-plugin/pom.xml b/zanata-maven-plugin/pom.xml
index e6a0d84b..b84aedfd 100644
--- a/zanata-maven-plugin/pom.xml
+++ b/zanata-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>client</artifactId>
-    <version>3.8.4-SNAPSHOT</version>
+    <version>3.8.4</version>
 
   </parent>
   <artifactId>zanata-maven-plugin</artifactId>
@@ -27,7 +27,7 @@
     <connection>scm:git:git://github.com/zanata/zanata-client.git</connection>
     <developerConnection>scm:git:git@github.com:zanata/zanata-client.git</developerConnection>
     <url>https://github.com/zanata/zanata-client</url>
-    <tag>HEAD</tag>
+    <tag>client-3.8.4</tag>
   </scm>
 
   <prerequisites>
diff --git a/zanata-rest-client/pom.xml b/zanata-rest-client/pom.xml
index 1c591c59..b5478484 100644
--- a/zanata-rest-client/pom.xml
+++ b/zanata-rest-client/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>client</artifactId>
-    <version>3.8.4-SNAPSHOT</version>
+    <version>3.8.4</version>
 
   </parent>
   <packaging>jar</packaging>
@@ -16,7 +16,7 @@
     <connection>scm:git:git://github.com/zanata/zanata-client.git</connection>
     <developerConnection>scm:git:git@github.com:zanata/zanata-client.git</developerConnection>
     <url>https://github.com/zanata/zanata-client</url>
-    <tag>HEAD</tag>
+    <tag>client-3.8.4</tag>
   </scm>
 
   <dependencies>