diff --git a/Jenkinsfile b/Jenkinsfile
index 02bdc9fb..8f6fa02e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,34 +1,50 @@
-node ('xretorch-agent') {
-    stage ('Clone eShopContainers Project') {
+pipeline {
+    agent {
+        label 'xretorch-agent'
+    }
+    environment {
+        ET_EUS_API = "http://selenoid:4444/wd/hub"
+        CURRENT_DATE = "date +\'[%m-%d-%y] %T - \'"
+        DOCKER_CLIENT_TIMEOUT = 120
+        COMPOSE_HTTP_TIMEOUT = 120
+    }
+    options {
+        disableConcurrentBuilds()
+    }
+    stages {
+        stage('Clone eShopContainers Project') {
+            steps {
+                checkout([
+                    $class: 'GitSCM',
+                    branches: [[name: '*/retorch']],
+                    userRemoteConfigs: [[url: 'https://github.com/augustocristian/retorch-st-eShopOnContainers.git']]
+                ])
+                checkout scm
+            }
+        }
 
-    checkout([$class: 'GitSCM', branches: [[name: '*/retorch']],
-        userRemoteConfigs: [[url: 'https://github.com/augustocristian/retorch-st-eShopOnContainers.git']]])
-    checkout scm
+        stage('SETUP-Infrastructure') {
+            steps {
+                sh 'chmod +x -R ./eshopcontainers-e2etestsuite/retorchfiles/scripts'
+                sh './eshopcontainers-e2etestsuite/retorchfiles/scripts/coilifecycles/coi-setup.sh'
+            }
+        }
 
-    }//End git stage
+        stage('test') {
+            steps {
+                sh "sleep 10"
+                sh "mvn test"
+            }
+        }
+    }
 
-     stage('SETUP-Infrastructure') {
-                sh 'ls -a .'
-                sh 'cd ./eshopcontainers-e2etestsuite'
-                sh 'ls -a .'
-               //Change the permisions to the scripts folder the
-                sh 'chmod +x -R ./retorchfiles/scripts'
-                sh './retorchfiles/scripts/coilifecycles/coi-setup.sh'
-          }//EndStageSETUPInf
-
-
-
-    stage('test') {
-
-        sh "sleep 10"
-        sh "mvn test"
-    }// End test stage
- post {
-      always {
-          archiveArtifacts artifacts: 'artifacts/*.csv', onlyIfSuccessful: true      }//EndAlways
-      cleanup {
-          cleanWs()
-          sh """(eval \$CURRENT_DATE ; echo "Cleaning Environment ") | cat |tr '\n' ' ' """
-          sh './retorchfiles/scripts/coilifecycles/coi-teardown.sh'     }//EndCleanUp
- }//EndPostActions
-}
\ No newline at end of file
+    post {
+        //always {
+            // archiveArtifacts artifacts: 'eshopcontainers-e2etestsuite/artifacts/*.csv', onlyIfSuccessful: true
+        //}
+        cleanup {
+            sh """(eval \$CURRENT_DATE ; echo "Cleaning Environment ") | cat | tr '\n' ' ' """
+            sh './eshopcontainers-e2etestsuite/retorchfiles/scripts/coilifecycles/coi-teardown.sh'
+        }
+    }
+}
diff --git a/eshopcontainers-e2etestsuite/retorchfiles/scripts/coilifecycles/coi-setup.sh b/eshopcontainers-e2etestsuite/retorchfiles/scripts/coilifecycles/coi-setup.sh
index 34aa21fe..ec19a2eb 100644
--- a/eshopcontainers-e2etestsuite/retorchfiles/scripts/coilifecycles/coi-setup.sh
+++ b/eshopcontainers-e2etestsuite/retorchfiles/scripts/coilifecycles/coi-setup.sh
@@ -1,12 +1,19 @@
 #!/bin/bash
-OUTPUTDIRCOI="./src/retorchcostestimationdata/exec$BUILD_NUMBER/COI.data"
+OUTPUTDIRCOI="./eshopcontainers-e2etestsuite/src/retorchcostestimationdata/exec$BUILD_NUMBER/COI.data"
 COISETUPSTART=$(date +%s%3N)
-
+ls -la ..
 #Directories to store the data
-mkdir -p "./src/retorchcostestimationdata/exec$BUILD_NUMBER"
-mkdir -p "./artifacts"
+mkdir -p "./eshopcontainers-e2etestsuite/src/retorchcostestimationdata/exec$BUILD_NUMBER"
+mkdir -p "./eshopcontainers-e2etestsuite/artifacts"
 #Here goes the COI set-up
 
+git pull "https://github.com/augustocristian/retorch-st-eShopOnContainers.git"
+cd ./retorch-st-eShopOnContainers/src
+git checkout retorch
+ls ..
+
+cd ../..
+
 
 #Here ends the COI set-up
 
diff --git a/eshopcontainers-e2etestsuite/retorchfiles/scripts/coilifecycles/coi-teardown.sh b/eshopcontainers-e2etestsuite/retorchfiles/scripts/coilifecycles/coi-teardown.sh
index ccbe582b..c78d96ea 100644
--- a/eshopcontainers-e2etestsuite/retorchfiles/scripts/coilifecycles/coi-teardown.sh
+++ b/eshopcontainers-e2etestsuite/retorchfiles/scripts/coilifecycles/coi-teardown.sh
@@ -5,9 +5,9 @@ COITEARDOWNSTART="$(date +%s%3N)"
 echo 'Switch off all containers...'
 docker stop "$(docker ps | grep eShopContainers | awk '{print \$1}')" || echo 'All the containers are stopped!'
 docker rm --volumes "$(docker ps -a | grep eShopContainers | awk '{print \$1}')" || echo 'All the containers are removed!'
-sh 'retorchfiles/scripts/saveTJobLifecycledata.sh'
+sh './eshopcontainers-e2etestsuite/retorchfiles/scripts/saveTJobLifecycledata.sh'
 COITEARDOWNEND="$(date +%s%3N)"
 
-OUTPUTDIRCOI="./src/retorchcostestimationdata/exec$BUILD_NUMBER/COI.data"
+OUTPUTDIRCOI="./eshopcontainers-e2etestsuite/src/retorchcostestimationdata/exec$BUILD_NUMBER/COI.data"
 echo -n ";$COITEARDOWNSTART;$COITEARDOWNEND" >>"$OUTPUTDIRCOI"
 
diff --git a/eshopcontainers-e2etestsuite/retorchfiles/scripts/saveTJobLifecycledata.sh b/eshopcontainers-e2etestsuite/retorchfiles/scripts/saveTJobLifecycledata.sh
index 5fd3a30c..3019e99a 100644
--- a/eshopcontainers-e2etestsuite/retorchfiles/scripts/saveTJobLifecycledata.sh
+++ b/eshopcontainers-e2etestsuite/retorchfiles/scripts/saveTJobLifecycledata.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-PATH_FILES="./src/retorchcostestimationdata/exec${BUILD_NUMBER}/tjob*"
-OUTPUT_FILE="./artifacts/lifecycletimmingsexec${BRANCH_NAME///}-${BUILD_NUMBER}.csv"
-OUTPUTDIRCOI="./src/retorchcostestimationdata/exec$BUILD_NUMBER/COI.data"
+PATH_FILES="./eshopcontainers-e2etestsuite/src/retorchcostestimationdata/exec${BUILD_NUMBER}/tjob*"
+OUTPUT_FILE="./eshopcontainers-e2etestsuite/artifacts/lifecycletimmingsexec${BRANCH_NAME///}-${BUILD_NUMBER}.csv"
+OUTPUTDIRCOI="./eshopcontainers-e2etestsuite/src/retorchcostestimationdata/exec$BUILD_NUMBER/COI.data"
 echo "tjobname;stage;COI-setup-start;COI-setup-end;tjob-setup-start;tjob-setup-end;tjob-testexec-start;tjob-testexec-end;tjob-teardown-start;tjob-teardown-end;coi-teardown-start;coi-teardown-end" >"$OUTPUT_FILE"
 for csvfile in $PATH_FILES; do
   {