diff --git a/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy b/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
index 68ab3482..38780359 100644
--- a/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
+++ b/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
@@ -109,6 +109,8 @@ class ImageBuilder {
           steps.dir(workspace) {
             if (buildxBuilderName != null && !buildxBuilderName.isEmpty() && architectures.size() > 1) {
               steps.log.info("ImageBuilder", "Building image ${registry}/${repository}/${name} with architectures: ${architectures} using buildx builder: ${buildxBuilderName}, tag sets to ${version}")
+              def currentPath = steps.sh(script: "pwd", returnStdout: true).trim()
+              steps.log.info("ImageBuilder", "Current working dir: ${currentPath}")
               steps.log.info("ImageBuilder", "Set builder log level to plain...")
               steps.env.BUILDKIT_PROGRESS = "plain"
               steps.log.info("ImageBuilder", "Set builder timeout to 10min...")
diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index 0a0cd2c1..cd9b049d 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -535,7 +535,7 @@ spec:
                       def stashName = artifact.replace('/', '-').replace('.', '-')
                       log.info("Pipeline", "Fetch stashed directory ${artifact} for ${component.name}...")
                       unstash "${component.name}-${stashName}"
-                      def artifactList = sh(script: "ls ${artifact} -al", returnStdout: true)
+                      def artifactList = sh(script: "ls ${artifact} -al && pwd", returnStdout: true)
                       log.info("Pipeline", "Unstashed files: ${artifactList}")
                     }
                   }