diff --git a/Jenkinsfile b/Jenkinsfile
index 8de7fd6..6fe2627 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,159 +1,20 @@
-import groovy.json.JsonSlurper
+#!/bin/bash
+# https://gist.github.com/omegazeng/d9d07a8a1c2bd7bb2cab38e32a12058b
 
-VERSION_NUMBER = ""
+export LC_ALL=en_US.UTF-8
 
-/** Pipeline **/
-node {
-    ws('netcore') {
-        try{
-            stage("scm pull") {
-				deleteDir();
-				cloneRepo();
-                VERSION_NUMBER = getVersionNumber();
-                currentBuild.displayName = "$VERSION_NUMBER";
-            }
+set +x
 
-            stage ("dotnet build") {
-				dotnet_build();
-            }
+REGISTRY_URL=$1
+IMAGE_NAME=$2
 
-            stage ("dotnet test") {
-				dotnet_test();
-            }
-
-            stage ("dotnet publish") {
-				dotnet_publish();
-            }
-
-            stage ("docker build") {
-				docker_build();
-            }
-
-            stage ("docker run") {
-				docker_run();
-            }
-        }
-        catch (InterruptedException x) {
-            currentBuild.result = 'ABORTED';
-            throw x;
-        }
-        catch (e) {
-            currentBuild.result = 'FAILURE';
-            throw e;
-        }
-    }
-}
-
-def cloneRepo() {
-    checkout scm;
-}
-
-def dotnet_build(){
-	dir('Merken.NetCoreBuild.App') {
-		sh(script: 'dotnet build Merken.NetCoreBuild.App.csproj', returnStdout: true);
-	}
-}
-
-def dotnet_test(){
-	dir('Merken.NetCoreBuild.Test') {
-		
-		sh(script: 'dotnet restore', returnStdout: true);
-		sh(script: 'dotnet xunit -xml xunit-results.xml', returnStdout: true);
-    }
-
-    dir('Merken.NetCoreBuild.Transform') {
-		sh(script: 'dotnet run ../Merken.NetCoreBuild.Test/xunit-results.xml xunitdotnet-2.0-to-junit-2.xsl junit-results.xml', returnStdout: true);
-
-        step([$class: 'XUnitBuilder',
-            thresholds: [[$class: 'FailedThreshold', unstableThreshold: '1']],
-            tools: [[$class: 'JUnitType', pattern: '*.*']]])
-	}
-}
-
-def dotnet_publish(){
-    dir('Merken.NetCoreBuild.App') {
-        sh(script: 'dotnet publish Merken.NetCoreBuild.App.csproj -o ./obj/Docker/publish', returnStdout: true);
-        sh(script: 'cp Dockerfile ./obj/Docker/publish', returnStdout: true);
-        sh(script: 'tar zcf netcoreapp.tar.gz -C ./obj/Docker/publish .', returnStdout: true);
-    }
-}
-
-def docker_build(){
-    dir('Merken.NetCoreBuild.App') {
-        dockerApiRequest('containers/netcoreapp/stop', 'POST');
-        dockerApiRequest('containers/prune', 'POST');
-        dockerApiRequest('images/netcoreapp', 'DELETE');
-        dockerApiRequest('build?t=netcoreapp:' + VERSION_NUMBER + '&nocache=1&rm=1', 'POST', 'tar','', '@netcoreapp.tar.gz', true);
-    }
-}
-
-def docker_run(){
-    dir('Merken.NetCoreBuild.App') {
-        def containerId = createContainer();
-        renameContainer(containerId);
-        startContainer();
-    }
-}
-
-def createContainer(){
-    sh('echo \'{ "Image": "netcoreapp:' + VERSION_NUMBER + '", "ExposedPorts": { "5000/tcp" : {} }, "HostConfig": { "PortBindings": { "5000/tcp": [{ "HostPort": "5000" }] } } }\' > imageconf');
-
-    def createResponse = dockerApiRequest('containers/create', 'POST', 'json', 'json', '@imageconf');
-    def containerId = createResponse.Id;
-
-    return containerId;
-}
-
-def renameContainer(containerId){
-    def request = 'containers/' + containerId + '/rename?name=netcoreapp';
-    dockerApiRequest(request, 'POST');
-}
-
-def startContainer(){
-    dockerApiRequest('containers/netcoreapp/start', 'POST');
-}
-
-//Generates a version number
-def getVersionNumber() {
-    def out = sh(script: 'git rev-list --count HEAD', returnStdout: true);
-    def array = out.split("\\r?\\n");
-    def count = array[array.length - 1];
-
-    def commitCount = count.trim();
-
-    return commitCount;
-}
-
-def dockerApiRequest(request, method, contenttype = 'json', accept = '', data = '', isDataBinary = false){
-    def requestBuilder = 'curl -v -X ' + method + ' --unix-socket /var/run/docker.sock "http://0.0.0.0:2375/' + request + '"';
-
-    if(contenttype == 'json'){
-        requestBuilder += ' -H "Content-Type:application/json"';
-    }
-
-    if(contenttype == 'tar'){
-        requestBuilder += ' -H "Content-Type:application/x-tar"';
-    }
-
-    if(accept == 'json'){
-        requestBuilder += ' -H "Accept: application/json"';
-    }
-    
-    if(data.trim()){
-        if(isDataBinary){
-            requestBuilder += ' --data-binary ' + data + ' --dump-header - --no-buffer';
-        }else{
-            requestBuilder += ' -d ' + data;
-        }
-    }
-
-    def response = sh(script: requestBuilder, returnStdout:true);
-    
-    if(accept == 'json'){
-        def jsonSlurper = new JsonSlurper();
-        def json = jsonSlurper.parseText(response);
-        return json;
-    }
-
-    return null;
-}
\ No newline at end of file
+BUILD_DATETIME=$(date +%Y%m%d%H%M%S)
+GIT_COMMIT_SHORT=$(echo ${GIT_COMMIT} | cut -c 1-8)
+BRANCH=$(echo ${GIT_BRANCH} | sed s#/#-#g)
+ls -al
+docker info
+docker build --rm -t ${REGISTRY_URL}/${IMAGE_NAME}:${BRANCH}-${GIT_COMMIT_SHORT}-${BUILD_DATETIME}-${BUILD_NUMBER} .
+docker images | grep ${REGISTRY_URL}/${IMAGE_NAME}
+docker login ${REGISTRY_URL} -u ${REGISTRY_USERNAME} -p ${REGISTRY_PASSWORD}
+docker push ${REGISTRY_URL}/${IMAGE_NAME}:${BRANCH}-${GIT_COMMIT_SHORT}-${BUILD_DATETIME}-${BUILD_NUMBER}
+docker system prune --volumes -f
\ No newline at end of file