diff --git a/Jenkinsfile b/Jenkinsfile
index fe54c4d20d3528013cc0ef8fc5ca8481a6e4270a..06c2b68cf5db6f76963578a7c2a01e69d5064c52 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -187,16 +187,19 @@ pipeline {
         stage('Test, build and deploy Helm Chart') {
             steps {
                 container('k8s') {
-                    FAILED_GOOFY_STAGE=env.STAGE_NAME
-                    def helmChartVersion = generateImageTag()
-                    setHelmChartVersion(helmChartVersion)
+                    script {
+                        FAILED_GOOFY_STAGE=env.STAGE_NAME
+                        def helmChartVersion = generateImageTag()
+
+                        setHelmChartVersion(helmChartVersion)
 
-                    sh "helm lint -f goofy-server/src/main/helm/test-values.yaml goofy-server/src/main/helm"
-                    sh "helm unittest -f '../../test/helm/*.yaml' goofy-server/src/main/helm"
+                        sh "helm lint -f goofy-server/src/main/helm/test-values.yaml goofy-server/src/main/helm"
+                        sh "helm unittest -f '../../test/helm/*.yaml' goofy-server/src/main/helm"
 
-                    sh "helm package goofy-server/src/main/helm"
+                        sh "helm package goofy-server/src/main/helm"
 
-                    deployHelmChart(helmChartVersion)
+                        deployHelmChart(helmChartVersion)
+                    }
                 }
             }
         }