diff --git a/besom-cfg/k8s/src/main/scala/ConfiguredContainerArgs.scala b/besom-cfg/k8s/src/main/scala/ConfiguredContainerArgs.scala
index 43d28e0f..d848e757 100644
--- a/besom-cfg/k8s/src/main/scala/ConfiguredContainerArgs.scala
+++ b/besom-cfg/k8s/src/main/scala/ConfiguredContainerArgs.scala
@@ -15,7 +15,7 @@ import besom.cfg.k8s.syntax.*
 
 object syntax:
   extension (s: Struct)
-    def foldedToEnvVarArgs(using Context): Output[List[EnvVarArgs]] =
+    def foldedToEnvVarArgs: Output[List[EnvVarArgs]] =
       s.foldToEnv.map(_.map { case (k, v) => EnvVarArgs(name = k, value = v) })
 
 object ConfiguredContainerArgs:
@@ -132,7 +132,8 @@ object ConfiguredContainerArgs:
         val envExpr = '{
           val envOutput                 = ${ env }.asOptionOutput()
           val conf                      = ${ configuration }
-          val configurationAsEnvVarArgs = conf.foldedToEnvVarArgs(using $context)
+          val configurationAsEnvVarArgs = conf.foldedToEnvVarArgs
+
           envOutput.zip(configurationAsEnvVarArgs).map {
             case (Some(envVarArgsList), envVarArgsListFromConf) => envVarArgsList ++ envVarArgsListFromConf
             case (None, envVarArgsListFromConf)                 => envVarArgsListFromConf
@@ -165,7 +166,7 @@ object ConfiguredContainerArgs:
             volumeDevices = $volumeDevices,
             volumeMounts = $volumeMounts,
             workingDir = $workingDir
-          )(using $context)
+          )
         }
     end match
   end applyImpl
diff --git a/besom-cfg/lib/src/main/scala/Struct.scala b/besom-cfg/lib/src/main/scala/Struct.scala
index 0a24cb5e..1cd75f6e 100644
--- a/besom-cfg/lib/src/main/scala/Struct.scala
+++ b/besom-cfg/lib/src/main/scala/Struct.scala
@@ -18,7 +18,7 @@ class Struct private (val _values: ListMap[String, Any]) extends Selectable:
     onStruct: Map[String, Output[B]] => Output[B],
     onList: List[B] => Output[B],
     onValue: Any => Output[B]
-  )(using Context): Output[B] =
+  ): Output[B] =
     val onOutput: Output[_] => Output[B] = _.flatMap {
       case s: Struct => s.fold(onStruct, onList, onValue)
       case a         => onValue(a)
@@ -91,7 +91,7 @@ object Struct extends Dynamic:
         )
 
   extension (s: Struct)
-    def foldToEnv(using Context): Output[List[(String, String)]] = s.fold[List[(String, String)]](
+    def foldToEnv: Output[List[(String, String)]] = s.fold[List[(String, String)]](
       onStruct = { mapB =>
         mapB.foldLeft(Output(List.empty[(String, String)])) { case (acc, (k, v)) =>
           acc.flatMap { accList =>