diff --git a/first-class-pipeline/src/com/freeleaps/devops/DependenciesResolver.groovy b/first-class-pipeline/src/com/freeleaps/devops/DependenciesResolver.groovy
index 1eec141b..e0bde6d9 100644
--- a/first-class-pipeline/src/com/freeleaps/devops/DependenciesResolver.groovy
+++ b/first-class-pipeline/src/com/freeleaps/devops/DependenciesResolver.groovy
@@ -39,6 +39,7 @@ class DependenciesResolver {
     if (mgr == null) {
       steps.error("Dependencies manager is not set")
     }
+    steps.sh "env"
 
     steps.log.info("Dependencies Resolver","Ready to resolve dependencies for ${language}...")
 
diff --git a/first-class-pipeline/tests/Jenkinsfile b/first-class-pipeline/tests/Jenkinsfile
index 4048091b..ac99381b 100644
--- a/first-class-pipeline/tests/Jenkinsfile
+++ b/first-class-pipeline/tests/Jenkinsfile
@@ -15,7 +15,6 @@ executeFreeleapsPipeline {
       language: 'javascript',
       dependenciesManager: 'npm',
       npmPackageJsonFile: 'package.json',
-      buildAgentImage: 'node:lts',
       buildCacheEnabled: true,
       buildCommand: 'npm run build',
       lintEnabled: true,
@@ -38,7 +37,6 @@ executeFreeleapsPipeline {
       root: 'backend',
       language: 'python',
       dependenciesManager: 'pip',
-      buildAgentImage: 'python:3.10-slim-buster',
       buildCacheEnabled: true,
       lintEnabled: true,
       linter: 'PyLint',
diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index 2b77ac08..6091b169 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -19,10 +19,10 @@ def generateComponentStages(component, configurations) {
                     def language = ServiceLanguage.parse(configurations.serviceLang)
                     switch(language) {
                         case ServiceLanguage.PYTHON:
-                            buildAgentImage = "python:3.10-slim-buster"
+                            buildAgentImage = "docker.io/python:3.10-slim-buster"
                             break
                         case ServiceLanguage.JS:
-                            buildAgentImage = "node:lts-alpine"
+                            buildAgentImage = "docker.io/node:lts-alpine"
                             break
                         default:
                             error("Unknown service language")
@@ -65,9 +65,6 @@ def generateComponentStages(component, configurations) {
               } else {
                   dependenciesResolver.disableCachingSupport()
               }
-              
-              def version = sh(script: "node -v", returnStdout: true).trim()
-              log.info 'Dependencies Resolver', "Node version is ${version}"
 
               dependenciesResolver.resolve(component)
             }