diff --git a/Makefile b/Makefile
index af44d292..69e45b7a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,2 @@
 release:
-	mvn release:prepare release:perform -Dgoals=deploy release:clean
+	mvn release:clean release:prepare release:perform -Dgoals=deploy release:clean
diff --git a/pom.xml b/pom.xml
index 746eb6bd..87aa6d44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,7 +218,7 @@
         <version>3.1.1</version>
         <configuration>
           <autoVersionSubmodules>true</autoVersionSubmodules>
-          <tagNameFormat>v${project.version}</tagNameFormat>
+          <tagNameFormat>v@{project.version}</tagNameFormat>
         </configuration>
       </plugin>
       <plugin>