diff --git a/.gitea/workflows/render-manifests-automerge.yaml b/.gitea/workflows/render-manifests-automerge.yaml
index ce42ed27c..b27313460 100644
--- a/.gitea/workflows/render-manifests-automerge.yaml
+++ b/.gitea/workflows/render-manifests-automerge.yaml
@@ -191,7 +191,7 @@ jobs:
 
               echo ""
               echo ">> Formating rendered template ..."
-              echo "$TEMPLATE" | yq 'select(. != null)' | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name + ".yaml"'
+              echo "$TEMPLATE" | yq 'select(. != null)' | yq '... comments=""' | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name + ".yaml"'
 
               echo ""
               echo ">> Manifests for $chart_name rendered to $OUTPUT_FOLDER"
diff --git a/.gitea/workflows/render-manifests-dispatch.yaml b/.gitea/workflows/render-manifests-dispatch.yaml
index 63de42b84..9f83a5e0a 100644
--- a/.gitea/workflows/render-manifests-dispatch.yaml
+++ b/.gitea/workflows/render-manifests-dispatch.yaml
@@ -176,7 +176,7 @@ jobs:
 
               echo ""
               echo ">> Formating rendered template ..."
-              echo "$TEMPLATE" | yq 'select(. != null)' | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name + ".yaml"'
+              echo "$TEMPLATE" | yq 'select(. != null)' | yq '... comments=""' | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name + ".yaml"'
 
               echo ""
               echo ">> Manifests for $chart_name rendered to $OUTPUT_FOLDER"
diff --git a/.gitea/workflows/render-manifests-merge.yaml b/.gitea/workflows/render-manifests-merge.yaml
index 41ee7d6c8..a2e843856 100644
--- a/.gitea/workflows/render-manifests-merge.yaml
+++ b/.gitea/workflows/render-manifests-merge.yaml
@@ -196,7 +196,7 @@ jobs:
 
               echo ""
               echo ">> Formating rendered template ..."
-              echo "$TEMPLATE" | yq 'select(. != null)' | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name + ".yaml"'
+              echo "$TEMPLATE" | yq 'select(. != null)' | yq '... comments=""' | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name + ".yaml"'
 
               echo ""
               echo ">> Manifests for $chart_name rendered to $OUTPUT_FOLDER"
diff --git a/.gitea/workflows/render-manifests-push.yaml b/.gitea/workflows/render-manifests-push.yaml
index ebb7568c1..69fcfe8f9 100644
--- a/.gitea/workflows/render-manifests-push.yaml
+++ b/.gitea/workflows/render-manifests-push.yaml
@@ -194,7 +194,7 @@ jobs:
 
               echo ""
               echo ">> Formating rendered template ..."
-              echo "$TEMPLATE" | yq 'select(. != null)' | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name + ".yaml"'
+              echo "$TEMPLATE" | yq 'select(. != null)' | yq '... comments=""' | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name + ".yaml"'
 
               echo ""
               echo ">> Manifests for $chart_name rendered to $OUTPUT_FOLDER"