diff --git a/Jenkinsfile b/Jenkinsfile
index 59a4899..475944f 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ node {
     }
 
     withMaven(mavenConfiguration) {
-        def mvnParams = "-Dbuild.version=1.0.${BUILD_NUMBER} -Dbuild.development=false"
+        def mvnParams = "-Dbuild.number=${BUILD_NUMBER} -Dbuild.development=false"
 
         stage('Build') {
             sh "mvn ${mvnParams} clean compile"
@@ -29,7 +29,8 @@ node {
         }
 
         stage('Deploy') {
-            sh "mvn ${mvnParams} releaser:release"
+            sh "mvn ${mvnParams} -DskipStatic -DskipTests deploy"
+            sh "mvn ${mvnParams} scm:tag"
         }
     }
 }
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4fae628..aae6948 100755
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>se.koc</groupId>
     <artifactId>zutil</artifactId>
-    <version>${build.version}</version>
+    <version>1.0.${build.number}</version>
     <packaging>jar</packaging>
 
     <name>Zutil</name>
@@ -34,7 +34,7 @@
     </scm>
 
     <properties>
-        <build.version>1.0.0-SNAPSHOT</build.version>
+        <build.number>0-SNAPSHOT</build.number>
         <build.development>true</build.development>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -144,9 +144,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.1.1</version>
                 <configuration> <!-- TODO: Temporary until javadoc issues are solved -->
                     <doclint>none</doclint>
+                    <source>8</source>
                 </configuration>
                 <executions>
                     <execution>
@@ -175,13 +176,44 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>com.github.danielflower.mavenplugins</groupId>
-                <artifactId>multi-module-maven-release-plugin</artifactId>
-                <version>3.2.0</version>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.7</version>
+                <extensions>true</extensions>
                 <configuration>
-                   <serverId>repo.koc.se</serverId>
+                    <serverId>sonatype-nexus-snapshot</serverId>
+                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-scm-plugin</artifactId>
+                <version>1.9.5</version>
+                <configuration>
+                    <tag>${project.artifactId}-${project.version}</tag>
+                    <connectionType>developerConnection</connectionType>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>