diff --git a/common/pom.xml b/common/pom.xml
index 3fa39f2b21..1a78f9d407 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.jboss.aerogear.unifiedpush</groupId>
         <artifactId>unifiedpush-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.1.Final</version>
     </parent>
 
     <artifactId>unifiedpush-common</artifactId>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index fa7bf446d1..53f04c3879 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.jboss.aerogear.unifiedpush</groupId>
         <artifactId>unifiedpush-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.1.Final</version>
     </parent>
 
     <artifactId>unifiedpush-dependencies-parent</artifactId>
diff --git a/dependencies/server-dependencies/pom.xml b/dependencies/server-dependencies/pom.xml
index d438c89991..d06d016526 100644
--- a/dependencies/server-dependencies/pom.xml
+++ b/dependencies/server-dependencies/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.jboss.aerogear.unifiedpush</groupId>
         <artifactId>unifiedpush-dependencies-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.1.Final</version>
     </parent>
 
     <artifactId>unifiedpush-server-dependencies</artifactId>
diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
index d720408123..269e98294f 100644
--- a/jaxrs/pom.xml
+++ b/jaxrs/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.jboss.aerogear.unifiedpush</groupId>
         <artifactId>unifiedpush-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.1.Final</version>
     </parent>
 
     <artifactId>unifiedpush-jaxrs</artifactId>
diff --git a/migrator/pom.xml b/migrator/pom.xml
index 9fbfe013c6..f3b08cee2b 100644
--- a/migrator/pom.xml
+++ b/migrator/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.jboss.aerogear.unifiedpush</groupId>
         <artifactId>unifiedpush-parent</artifactId>
-				<version>2.1.1-SNAPSHOT</version>
+				<version>2.1.1.Final</version>
     </parent>
 
     <artifactId>unifiedpush-migrator</artifactId>
diff --git a/model/api/pom.xml b/model/api/pom.xml
index 9c1c6fa193..af52a4ef19 100644
--- a/model/api/pom.xml
+++ b/model/api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.jboss.aerogear.unifiedpush</groupId>
         <artifactId>unifiedpush-model-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.1.Final</version>
     </parent>
 
     <artifactId>unifiedpush-model-api</artifactId>
diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml
index b8e0b96faa..f62d744165 100644
--- a/model/jpa/pom.xml
+++ b/model/jpa/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.jboss.aerogear.unifiedpush</groupId>
         <artifactId>unifiedpush-model-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.1.Final</version>
     </parent>
 
     <artifactId>unifiedpush-model-jpa</artifactId>
diff --git a/model/pom.xml b/model/pom.xml
index c7aba25055..f06f641f80 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.jboss.aerogear.unifiedpush</groupId>
         <artifactId>unifiedpush-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.1.Final</version>
     </parent>
 
     <artifactId>unifiedpush-model-parent</artifactId>
diff --git a/model/push/pom.xml b/model/push/pom.xml
index 7661bdc5b8..c3aeb51a15 100644
--- a/model/push/pom.xml
+++ b/model/push/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.jboss.aerogear.unifiedpush</groupId>
         <artifactId>unifiedpush-model-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.1.Final</version>
     </parent>
 
     <artifactId>unifiedpush-push-model</artifactId>
diff --git a/pom.xml b/pom.xml
index 9de4d672de..7607e3d354 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,9 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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">
+<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>org.jboss.aerogear</groupId>
@@ -28,7 +26,7 @@
 
   <groupId>org.jboss.aerogear.unifiedpush</groupId>
   <artifactId>unifiedpush-parent</artifactId>
-  <version>2.1.1-SNAPSHOT</version>
+  <version>2.1.1.Final</version>
   <packaging>pom</packaging>
 
   <name>AeroGear UnifiedPush Server</name>
@@ -39,7 +37,7 @@
     <developerConnection>scm:git:git@github.com:aerogear/aerogear-unifiedpush-server.git
     </developerConnection>
     <url>https://github.com/aerogear/aerogear-unifiedpush-server</url>
-    <tag>HEAD</tag>
+    <tag>2.1.1.Final</tag>
   </scm>
 
   <issueManagement>
@@ -324,59 +322,53 @@
                 </goals>
                 <configuration>
                   <target>
-                    <taskdef name="jacoco-report" classname="org.jacoco.ant.ReportTask"
-                      classpathref="maven.plugin.classpath"/>
-                    <taskdef classpathref="maven.runtime.classpath"
-                      resource="net/sf/antcontrib/antcontrib.properties"/>
-                    <available file="${project.build.sourceDirectory}" type="dir"
-                      property="source.dir.exists"/>
-                    <available file="${jacoco.report.file}" property="exec.file.exists"/>
+                    <taskdef name="jacoco-report" classname="org.jacoco.ant.ReportTask" classpathref="maven.plugin.classpath" />
+                    <taskdef classpathref="maven.runtime.classpath" resource="net/sf/antcontrib/antcontrib.properties" />
+                    <available file="${project.build.sourceDirectory}" type="dir" property="source.dir.exists" />
+                    <available file="${jacoco.report.file}" property="exec.file.exists" />
                     <if>
-                      <equals arg1="${source.dir.exists}" arg2="true"/>
+                      <equals arg1="${source.dir.exists}" arg2="true" />
                       <then>
                         <copy todir="${jacoco.prep.sources}">
-                          <fileset dir="${project.build.sourceDirectory}"/>
+                          <fileset dir="${project.build.sourceDirectory}" />
                         </copy>
                         <copy todir="${jacoco.prep.classes}">
-                          <fileset dir="${project.build.directory}/classes"/>
+                          <fileset dir="${project.build.directory}/classes" />
                         </copy>
                         <if>
-                          <equals arg1="${exec.file.exists}" arg2="true"/>
+                          <equals arg1="${exec.file.exists}" arg2="true" />
                           <then>
                             <trycatch reference="report_exception">
                               <try>
                                 <jacoco-report>
                                   <executiondata>
-                                    <file file="${jacoco.report.file}"/>
+                                    <file file="${jacoco.report.file}" />
                                   </executiondata>
                                   <structure name="AeroGear UnifiedPush Server Unit Tests">
                                     <classfiles>
-                                      <fileset dir="${jacoco.prep.classes}"/>
+                                      <fileset dir="${jacoco.prep.classes}" />
                                     </classfiles>
                                     <sourcefiles encoding="${project.build.sourceEncoding}">
-                                      <fileset dir="${jacoco.prep.sources}"/>
+                                      <fileset dir="${jacoco.prep.sources}" />
                                     </sourcefiles>
                                   </structure>
-                                  <html destdir="${jacoco.report.output}"/>
+                                  <html destdir="${jacoco.report.output}" />
                                 </jacoco-report>
                               </try>
                               <catch>
-                                <property name="exception" refid="report_exception"/>
-                                <property name="message"
-                                  value="Error while generating jacoco report: ${exception}"/>
-                                <echo message="${message}"/>
+                                <property name="exception" refid="report_exception" />
+                                <property name="message" value="Error while generating jacoco report: ${exception}" />
+                                <echo message="${message}" />
                               </catch>
                             </trycatch>
                           </then>
                           <else>
-                            <echo
-                              message=".exec file is missing! Expected at: ${jacoco.report.file}!"/>
+                            <echo message=".exec file is missing! Expected at: ${jacoco.report.file}!" />
                           </else>
                         </if>
                       </then>
                       <else>
-                        <echo
-                          message="Source directory ${project.build.sourceDirectory} doesn't exist!"/>
+                        <echo message="Source directory ${project.build.sourceDirectory} doesn't exist!" />
                       </else>
                     </if>
                   </target>
diff --git a/push-sender/pom.xml b/push-sender/pom.xml
index a872747e4f..aa52339bfa 100644
--- a/push-sender/pom.xml
+++ b/push-sender/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.jboss.aerogear.unifiedpush</groupId>
         <artifactId>unifiedpush-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.1.Final</version>
     </parent>
 
     <artifactId>unifiedpush-push-sender</artifactId>
diff --git a/servers/keycloak/pom.xml b/servers/keycloak/pom.xml
index ba077a1c20..3bd91892df 100644
--- a/servers/keycloak/pom.xml
+++ b/servers/keycloak/pom.xml
@@ -15,13 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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">
+<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>org.jboss.aerogear.unifiedpush</groupId>
         <artifactId>unifiedpush-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.1.Final</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/servers/plain/pom.xml b/servers/plain/pom.xml
index db197ee13c..c68fd6e8b6 100644
--- a/servers/plain/pom.xml
+++ b/servers/plain/pom.xml
@@ -15,13 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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">
+<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>org.jboss.aerogear.unifiedpush</groupId>
         <artifactId>unifiedpush-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.1.Final</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/servers/pom.xml b/servers/pom.xml
index a8d2b94a59..9facce5d40 100644
--- a/servers/pom.xml
+++ b/servers/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.jboss.aerogear.unifiedpush</groupId>
         <artifactId>unifiedpush-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.1.Final</version>
     </parent>
 
     <name>UnifiedPush Servers Parent</name>
diff --git a/service/pom.xml b/service/pom.xml
index 8bc575d39f..88d0fb3f2a 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.jboss.aerogear.unifiedpush</groupId>
         <artifactId>unifiedpush-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.1.Final</version>
     </parent>
 
     <artifactId>unifiedpush-service</artifactId>