diff --git a/Jenkinsfile b/Jenkinsfile
index 22ce7db..f710d96 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,70 +1,7 @@
 // Readme @ http://gitlab.iex.ec:30000/iexec/jenkins-library
+@Library('jenkins-library@1.0.4') _
 
-@Library('jenkins-library@1.0.2') _
-
-// Build native docker image
-buildSimpleDocker(imageprivacy: 'public')
-
-// Build tee docker images
-node('docker') {
-
-    def sconifyToolImageName = 'scone-production/iexec-sconify-image'
-    def sconifyToolImageVersion = '5.3.6'
-    def sconifyToolArgsPath = './docker/sconify.args'
-
-    def gitShortCommit = sh(
-            script: 'git rev-parse --short HEAD',
-            returnStdout: true)
-            .trim()
-    def gitTag = sh(
-            script: 'git tag --points-at HEAD|tail -n1',
-            returnStdout: true)
-            .trim()
-    def imageTag = ("$gitTag" =~ /^\d{1,}\.\d{1,}\.\d{1,}$/)
-            ? "$gitTag"
-            : "$gitShortCommit-dev"
-
-    def imageRegistry = 'docker.io/iexechub'
-    def imageName = 'tee-worker-post-compute'
-    def nativeImage = "$imageRegistry/$imageName:$imageTag"
-    def unlockedImage = "nexus.iex.ec/$imageName-unlocked:$imageTag-debug";
-    def debugImage = "$imageRegistry/$imageName:$imageTag-debug"
-    def productionImage = "$imageRegistry/$imageName:$imageTag-production";
-
-
-    // /!\ UNLOCKED VERSION /!\
-    stage('Trigger "unlocked" TEE debug image build') {
-        sconeSigning(
-                IMG_FROM: "$nativeImage",
-                IMG_TO: "$unlockedImage",
-                SCRIPT_CONFIG: "$sconifyToolArgsPath",
-                SCONE_IMG_NAME: 'sconecuratedimages/iexec-sconify-image',
-                SCONE_IMG_VERS: '5.3.3',
-                FLAVOR: 'DEBUG'
-        )
-    }
-
-    stage('Trigger TEE debug image build') {
-        sconeSigning(
-                IMG_FROM: "$nativeImage",
-                IMG_TO: "$debugImage",
-                SCRIPT_CONFIG: "$sconifyToolArgsPath",
-                SCONE_IMG_NAME: "$sconifyToolImageName",
-                SCONE_IMG_VERS: "$sconifyToolImageVersion",
-                FLAVOR: 'DEBUG'
-        )
-    }
-
-    stage('Trigger TEE production image build') {
-        if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'main') {
-            sconeSigning(
-                    IMG_FROM: "$nativeImage",
-                    IMG_TO: "$productionImage",
-                    SCRIPT_CONFIG: "$sconifyToolArgsPath",
-                    SCONE_IMG_NAME: "$sconifyToolImageName",
-                    SCONE_IMG_VERS: "$sconifyToolImageVersion",
-                    FLAVOR: 'PROD'
-            )
-        }
-    }
-}
+def nativeImage = buildSimpleDocker_v2(dockerfileDir: './docker', buildContext: '.',
+        dockerImageRepositoryName: 'tee-worker-post-compute', imageprivacy: 'public')
+sconeBuildAllTee(nativeImage: nativeImage, targetImageRepositoryName: 'tee-worker-post-compute',
+        sconifyArgsPath: './docker/sconify.args')
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index e4312b4..2511208 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-version=6.0.0
+version=6.1.0
 iexecCommonVersion=5.4.0
\ No newline at end of file