diff --git a/Jenkinsfile b/Jenkinsfile
index fbb9f16..272b085 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,7 +15,7 @@ node {
     }
     
   stage 'Build'
-    
+
     def maintainer = maintainer()
     def imagename = imagename()
     def tag = env.BRANCH_NAME
@@ -26,12 +26,20 @@ node {
     if(maintainer){
       echo "Building ${maintainer}:${tag} for ${maintainer}"
     }
-    
-    sh 'bin/build.sh'
-    
+
+    sh 'bin/rebuild.sh'
+
+  stage 'Start container'
+
+    sh 'bin/ci-run.sh && sleep 60'
+
   stage 'Tests'
-  
+
     sh 'bin/test.sh'
+    // should build a finally construct here
+  stage 'Stop container'
+
+    sh 'bin/ci-stop.sh'
     
   stage 'Push'