diff --git a/docker/osm-krm-functions/scripts/library/helper-functions.rc b/docker/osm-krm-functions/scripts/library/helper-functions.rc
index 0a243df..867865f 100644
--- a/docker/osm-krm-functions/scripts/library/helper-functions.rc
+++ b/docker/osm-krm-functions/scripts/library/helper-functions.rc
@@ -423,11 +423,11 @@
   done
 
   # Wrap a full patch around, adding target specification
-  export PATCH_CONTENT
   local PATCH_FULL=$(
     yq --null-input ".target.kind = \"${TARGET_KIND}\", .target.name = \"${TARGET_NAME}\"" | \
-    yq ".patch = env(PATCH_CONTENT)" | \
-    yq "[ . ]"
+    yq eval-all 'select(fileIndex == 0) * select(fileIndex == 1)' - \
+      <(printf "patch: |-\n%s\n" "$(echo "${PATCH_CONTENT}" | sed 's/^/  /')" ) | \
+    yq "[.]"
   )
 
   echo "${PATCH_FULL}"