diff --git a/pkg/cmd/template/cmd.go b/pkg/cmd/template/cmd.go
index 4524a00a..66a667f8 100644
--- a/pkg/cmd/template/cmd.go
+++ b/pkg/cmd/template/cmd.go
@@ -124,12 +124,11 @@ func (o *TemplateOptions) RunWithFiles(in TemplateInput, ui cmdcore.PlainUI) Tem
 		// TODO find more generic way
 		switch fileInLib.File.Type() {
 		case files.TypeYAML:
-			_, resultVal, err := loader.EvalYAML(fileInLib.Library, fileInLib.File)
+			_, resultDocSet, err := loader.EvalYAML(fileInLib.Library, fileInLib.File)
 			if err != nil {
 				return TemplateOutput{Err: err}
 			}
 
-			resultDocSet := resultVal.(*yamlmeta.DocumentSet)
 			outputDocSets[fileInLib] = resultDocSet
 
 		case files.TypeText:
diff --git a/pkg/cmd/template/data_values_pre_processing.go b/pkg/cmd/template/data_values_pre_processing.go
index 3dc1dfe4..c1c42550 100644
--- a/pkg/cmd/template/data_values_pre_processing.go
+++ b/pkg/cmd/template/data_values_pre_processing.go
@@ -53,12 +53,11 @@ func (o DataValuesPreProcessing) Apply() (interface{}, error) {
 }
 
 func (p DataValuesPreProcessing) templateFile(fileInLib *workspace.FileInLibrary) ([]*yamlmeta.Document, error) {
-	_, resultVal, err := p.loader.EvalYAML(fileInLib.Library, fileInLib.File)
+	_, resultDocSet, err := p.loader.EvalYAML(fileInLib.Library, fileInLib.File)
 	if err != nil {
 		return nil, err
 	}
 
-	resultDocSet := resultVal.(*yamlmeta.DocumentSet)
 	tplOpts := yamltemplate.MetasOpts{IgnoreUnknown: p.IgnoreUnknownComments}
 
 	// Extract _all_ data values docs from the templated result
diff --git a/pkg/workspace/template_loader.go b/pkg/workspace/template_loader.go
index e358b792..6d8bd310 100644
--- a/pkg/workspace/template_loader.go
+++ b/pkg/workspace/template_loader.go
@@ -132,7 +132,7 @@ func (l *TemplateLoader) LoadData(thread *starlark.Thread, f *starlark.Builtin,
 	return starlark.String(string(fileBs)), nil
 }
 
-func (l *TemplateLoader) EvalYAML(library *Library, file *files.File) (starlark.StringDict, interface{}, error) {
+func (l *TemplateLoader) EvalYAML(library *Library, file *files.File) (starlark.StringDict, *yamlmeta.DocumentSet, error) {
 	fileBs, err := file.Bytes()
 	if err != nil {
 		return nil, nil, err
@@ -174,7 +174,7 @@ func (l *TemplateLoader) EvalYAML(library *Library, file *files.File) (starlark.
 		return nil, nil, err
 	}
 
-	return globals, resultVal, nil
+	return globals, resultVal.(*yamlmeta.DocumentSet), nil
 }
 
 func (l *TemplateLoader) EvalText(library *Library, file *files.File) (starlark.StringDict, *texttemplate.NodeRoot, error) {