diff --git a/orca-pipelinetemplate/orca-pipelinetemplate.gradle b/orca-pipelinetemplate/orca-pipelinetemplate.gradle
index 6b1288de0f..8b41fc711b 100644
--- a/orca-pipelinetemplate/orca-pipelinetemplate.gradle
+++ b/orca-pipelinetemplate/orca-pipelinetemplate.gradle
@@ -8,10 +8,7 @@ dependencies {
   implementation(project(":orca-front50"))
   implementation(project(":orca-clouddriver"))
 
-  implementation("com.hubspot.jinjava:jinjava:2.2.3") {
-    force = true
-  }
-
+  implementation("com.hubspot.jinjava:jinjava")
   implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
   implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
   implementation("com.jayway.jsonpath:json-path:2.2.0")
diff --git a/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/graph/transform/RenderTransform.java b/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/graph/transform/RenderTransform.java
index c0bdcbfb50..ff4da8a9a0 100644
--- a/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/graph/transform/RenderTransform.java
+++ b/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/graph/transform/RenderTransform.java
@@ -186,6 +186,7 @@ private void renderStage(StageDefinition stage, RenderContext context, String lo
               .withCause("Received type " + rendered.getClass().toString())
               .withLocation(context.getLocation()));
     }
+    context.getVariables().putAll((Map<String, Object>) rendered);
     stage.setConfig((Map<String, Object>) rendered);
 
     stage.setName(