diff --git a/first-class-pipeline/src/com/freeleaps/devops/EnvironmentVars.groovy b/first-class-pipeline/src/com/freeleaps/devops/EnvironmentVars.groovy
deleted file mode 100644
index 8ccaffb0..00000000
--- a/first-class-pipeline/src/com/freeleaps/devops/EnvironmentVars.groovy
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.freeleaps.devops
-
-import com.freeleaps.devops.enums.ServiceLanguage
-
-class EnvironmentVars {
-  def steps
-
-  EnvironmentVars(steps) {
-    this.steps = steps
-  }
-
-  def injectVars(configurations) {
-    if (configurations.serviceName == null || configurations.serviceName.isEmpty()) {
-      steps.error("serviceName is required")
-    }
-    steps.env.serviceName = configurations.serviceName
-
-    steps.env.serviceLang = ServiceLanguage.parse(configurations.serviceLang)
-    if (steps.env.serviceLang == ServiceLanguage.UNKNOWN) {
-      steps.error("Unknown service language: ${configurations.serviceLang}")
-    }
-
-    if (configurations.serviceGitRepo == null || configurations.serviceGitRepo.isEmpty()) {
-      steps.error("serviceGitRepo is required")
-    }
-    steps.env.serviceGitRepo = configurations.serviceGitRepo
-
-    if (configurations.serviceGitBranch == null || configurations.serviceGitBranch.isEmpty()) {
-      steps.error("serviceGitBranch is required")
-    }
-    steps.env.serviceGitBranch = configurations.serviceGitBranch
-
-    if (configurations.environmentSlug == null || configurations.environmentSlug.isEmpty()) {
-      steps.error("environmentSlug is required")
-    }
-    steps.env.environmentSlug = configurations.environmentSlug
-  }
-}
\ No newline at end of file
diff --git a/first-class-pipeline/tests/Jenkinsfile b/first-class-pipeline/tests/Jenkinsfile
index 91a75907..d0bcb92e 100644
--- a/first-class-pipeline/tests/Jenkinsfile
+++ b/first-class-pipeline/tests/Jenkinsfile
@@ -6,4 +6,5 @@ executeFreeleapsPipeline {
   environmentSlug = 'alpha'
   dependenciesManager = 'PIP'
   pipRequirementsFile = 'requirements.txt'
+  buildCacheEnabled = true
 }
\ No newline at end of file
diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index 27dd92f0..e171c090 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -1,6 +1,5 @@
 #!groovy
 
-import com.freeleaps.devops.EnvironmentVars
 import com.freeleaps.devops.SourceFetcher
 import com.freeleaps.devops.DependenciesResolver
 import com.freeleaps.devops.enums.DependenciesManager
@@ -12,8 +11,6 @@ def call(body) {
   body.delegate = configurations
   body()
 
-  def environmentVars = new EnvironmentVars(this)
-
   pipeline {
     agent any
     options {
@@ -32,14 +29,6 @@ def call(body) {
         }
       }
 
-      stage("Prepared Environment Variables") {
-        steps {
-          script {
-            environmentVars.injectVars(configurations)
-          }
-        }
-      }
-
       stage("Commit Linting If Enabled") {
         steps {
           script {
@@ -59,7 +48,7 @@ def call(body) {
             if (buildAgentImage == null || buildAgentImage.isEmpty()) {
               echo "Not set buildAgentImage, using default build agent image"
 
-              def language = env.serviceLang
+              def language = ServiceLanguage.parse(configurations.serviceLang)
               switch(language) {
                 case ServiceLanguage.PYTHON:
                   buildAgentImage = "python:3.10-slim-buster"
@@ -106,7 +95,7 @@ spec:
         }
         steps {
           script {
-            def language = env.serviceLang
+            def language = ServiceLanguage.parse(configurations.serviceLang)
 
             def depManager = DependenciesManager.parse(configurations.dependenciesManager)
             if (depManager == DependenciesManager.UNKNOWN) {
@@ -116,7 +105,7 @@ spec:
             def dependenciesResolver = new DependenciesResolver(this, language)
             dependenciesResolver.useManager(depManager)
             
-            if (configurations.BUILD_CACHE_ENABLED == "true") {
+            if (configurations.buildCacheEnabled) {
               dependenciesResolver.enableCachingSupport()
             } else {
               dependenciesResolver.disableCachingSupport()