diff --git a/Jenkinsfile b/Jenkinsfile
index 8ffc469..ff20725 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,12 +16,6 @@ void checkout_project(String repoUrl, String branch = 'develop') {
 }
 
 pipeline {
-    agent {
-        docker { 
-                image 'git.minres.com/tooling/riscof_sail:latest'
-                args '-e CONAN_USER_HOME=/var/jenkins_home/workspace/riscof_sail'
-            } 
-    }
     stages {
         stage("Checkout TGC-Compliance and TGC-GEN"){
             steps {
@@ -33,58 +27,64 @@ pipeline {
                 }
             }
         }
-        stage("generate cores "){
-            agent {docker { image 'ubuntu-riscv' } }
+        stage("generate cores and build TGC-ISS"){
+            agent {docker { image 'ubuntu-riscv' }}
             steps {
                 sh 'TGC-GEN/scripts/generate_all.sh -o dbt-rise-tgc'
-            }
-        }
-        stage("build TGC-ISS"){
-            steps {
                 sh 'conan profile new default --detect --force'
                 sh 'cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWITH_ASMJIT=ON -DWITH_TCC=ON -DWITH_LLVM=ON'
                 sh 'cmake --build build -j'
             }
         }
-        stage('ACT 32bit') {
-            matrix {
-                axes {
-                    axis {
-                        name 'CORE'
-                        values 'TGC5A', 'TGC5B', 'TGC5C', 'TGC5D', 'TGC5E'
-                    }
-                    axis {
-                        name 'BACKEND'
-                        values 'interp', 'llvm', 'tcc', 'asmjit'
-                    }
-                }
-                stages {
-                    stage('Run riscof') {
-                        steps {
-                            sh "mkdir ${BACKEND}"
-                            sh "python3 TGC-COMPLIANCE/run_act.py -core ${CORE} -sim build/dbt-rise-tgc/tgc-sim -w ${BACKEND} --local --backend ${BACKEND}"
+        stage{
+            agent {
+                docker { 
+                        image 'git.minres.com/tooling/riscof_sail:latest'
+                        args ' -e CONAN_USER_HOME=/var/jenkins_home/workspace/riscof_sail'
+                } 
+            }
+            stages {
+                stage('ACT 32bit') {
+                    matrix {
+                        axes {
+                            axis {
+                                name 'CORE'
+                                values 'TGC5A', 'TGC5B', 'TGC5C', 'TGC5D', 'TGC5E'
+                            }
+                            axis {
+                                name 'BACKEND'
+                                values 'interp', 'llvm', 'tcc', 'asmjit'
+                            }
+                        }
+                        stages {
+                            stage('Run riscof') {
+                                steps {
+                                    sh "mkdir ${BACKEND}"
+                                    sh "python3 TGC-COMPLIANCE/run_act.py -core ${CORE} -sim build/dbt-rise-tgc/tgc-sim -w ${BACKEND} --local --backend ${BACKEND}"
+                                }
+                            }
                         }
                     }
                 }
-            }
-        }
-        stage('ACT 64bit') {
-            matrix {
-                axes {
-                    axis {
-                        name 'CORE'
-                            values 'TGC6B', 'TGC6C', 'TGC6D', 'TGC6E'
-                    }
-                    axis {
-                        name 'BACKEND'
-                        values 'interp', 'llvm', 'asmjit'
-                    }
-                }
-                stages {
-                    stage('Run riscof') {
-                        steps {
-                            sh "mkdir ${BACKEND}"
-                            sh "python3 TGC-COMPLIANCE/run_act.py -core ${CORE} -sim build/dbt-rise-tgc/tgc-sim -w ${BACKEND} --local --backend ${BACKEND}"
+                stage('ACT 64bit') {
+                    matrix {
+                        axes {
+                            axis {
+                                name 'CORE'
+                                    values 'TGC6B', 'TGC6C', 'TGC6D', 'TGC6E'
+                            }
+                            axis {
+                                name 'BACKEND'
+                                values 'interp', 'llvm', 'asmjit'
+                            }
+                        }
+                        stages {
+                            stage('Run riscof') {
+                                steps {
+                                    sh "mkdir ${BACKEND}"
+                                    sh "python3 TGC-COMPLIANCE/run_act.py -core ${CORE} -sim build/dbt-rise-tgc/tgc-sim -w ${BACKEND} --local --backend ${BACKEND}"
+                                }
+                            }
                         }
                     }
                 }