diff --git a/Jenkinsfile b/Jenkinsfile
index 674131c..06dbe23 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -124,6 +124,16 @@ pipeline {
                         options {
                             lock("One Board at a time")
                         }
+                        when{
+                            not {
+                                anyof {
+                                    expression { BOARD == 'Moonlight' && CORE_TYPE =='64'}
+                                }
+                                anyof {
+                                    expression { BOARD == 'TGC_VP' && CORE_TYPE =='64'}
+                                }
+                            }
+                        }
                         stages {
                             stage("CMAKE") {
                                 steps {
@@ -138,21 +148,27 @@ pipeline {
             } 
         }
         stage("Checkout TGC-ISS, TGC-Compliance and TGC-GEN"){
-                    steps {
-                        sh 'rm -rf * .??* '
-                        checkout_iss_project("https://git.minres.com/TGFS/TGC-ISS.git", "develop")
-                        dir("TGC-COMPLIANCE"){
-                            checkout_iss_project("https://git.minres.com/TGFS/TGC-COMPLIANCE.git", "master")
-                        }
-                        dir("TGC-GEN"){
-                            checkout_iss_project("https://git.minres.com/TGFS/TGC-GEN.git", "develop")
-                        }
-                        
+                    steps {                        
+                        sh 'pwd'
+                        dir("TGC-ISS"){
+                            sh 'pwd'
+                            sh 'rm -rf * .??* '
+                            checkout_iss_project("https://git.minres.com/TGFS/TGC-ISS.git", "develop")
+                            dir("TGC-COMPLIANCE"){
+                                sh 'pwd'
+                                checkout_iss_project("https://git.minres.com/TGFS/TGC-COMPLIANCE.git", "master")
+                            }
+                            dir("TGC-GEN"){
+                                sh 'pwd'
+                                checkout_iss_project("https://git.minres.com/TGFS/TGC-GEN.git", "develop")
+                            }                            
+                        } 
                     }
                 }
         stage("Generate cores and build TGC-ISS"){
                     steps {
                         sh 'pwd'
+                        sh 'ls'
                         sh 'conan profile detect --force'
                         sh 'rm -rf build'
                         /*
diff --git a/hello-world/CMakePresets.json b/hello-world/CMakePresets.json
index 8ebf6fc..0337390 100644
--- a/hello-world/CMakePresets.json
+++ b/hello-world/CMakePresets.json
@@ -83,10 +83,12 @@
         },
         {
             "name": "Moonlight_Debug_64",
+            "hidden": true,
             "inherits": ["moonlight", "debug", "64imc"]
         },
         {
             "name": "TGC_VP_Debug_64",
+            "hidden": true,
             "inherits": ["tgc_vp", "debug", "64imc"]
         },
         {
@@ -102,15 +104,17 @@
             "inherits": ["tgc_vp", "release", "32imc"]
         },
         {
-            "name": "ISS_Release_64",
+            "name": "ISS_Release_64",        
             "inherits": ["iss", "release", "64imc"]
         },
         {
             "name": "Moonlight_Release_64",
+            "hidden": true,
             "inherits": ["moonlight", "release", "64imc"]
         },
         {
             "name": "TGC_VP_Release_64",
+            "hidden": true,
             "inherits": ["tgc_vp", "release", "64imc"]
         }