diff --git a/pkg/app/app_test.go b/pkg/app/app_test.go
index 33301d01..6ae9c122 100644
--- a/pkg/app/app_test.go
+++ b/pkg/app/app_test.go
@@ -135,6 +135,7 @@ environments:
   default:
     values:
     - env.*.yaml
+---
 releases:
 - name: zipkin
   chart: stable/zipkin
@@ -184,6 +185,7 @@ environments:
   default:
     values:
     - env.*.yaml
+---
 releases:
 - name: zipkin
   chart: stable/zipkin
@@ -230,6 +232,7 @@ bases:
 - base.yaml
 environments:
   test:
+--
 releases:
 - name: zipkin
   chart: stable/zipkin
@@ -281,6 +284,7 @@ environments:
     missingFileHandler: %s
     values:
     - %s
+---
 releases:
 - name: zipkin
   chart: stable/zipkin
@@ -393,7 +397,7 @@ helmfiles:
 		"/path/to/helmfile.d/a1.yaml": `
 environments:
   prod:
-
+---
 releases:
 - name: zipkin
   chart: stable/zipkin
@@ -814,6 +818,7 @@ environments:
   default:
     values:
     - ns: INLINE_NS
+---
 releases:
 - name: foo
   chart: stable/zipkin
@@ -977,7 +982,7 @@ releases:
 
 func TestVisitDesiredStatesWithReleasesFiltered_EnvironmentValueOverrides(t *testing.T) {
 	files := map[string]string{
-		"/path/to/helmfile.yaml": `
+		"/path/to/helmfile.yaml.gotmpl": `
 environments:
   default:
     values:
diff --git a/pkg/app/testdata/app_list_test/filters_releases_for_environment_used_in_multiple_files b/pkg/app/testdata/app_list_test/filters_releases_for_environment_used_in_multiple_files
index 8350e3c8..b161220b 100644
--- a/pkg/app/testdata/app_list_test/filters_releases_for_environment_used_in_multiple_files
+++ b/pkg/app/testdata/app_list_test/filters_releases_for_environment_used_in_multiple_files
@@ -1,221 +1,16 @@
 found 3 helmfile state files in helmfile.d: /path/to/helmfile.d/helmfile_1.yaml, /path/to/helmfile.d/helmfile_2.yaml, /path/to/helmfile.d/helmfile_3.yaml
 processing file "helmfile_1.yaml" in directory "/path/to/helmfile.d"
 changing working directory to "/path/to/helmfile.d"
-first-pass rendering starting for "helmfile_1.yaml.part.0": inherited=&{shared  map[] map[]}, overrode=<nil>
-first-pass uses: &{shared  map[] map[]}
-first-pass rendering output of "helmfile_1.yaml.part.0":
- 0: 
- 1: environments:
- 2:   development: {}
- 3:   shared: {}
-
-first-pass produced: &{shared  map[] map[]}
-first-pass rendering result of "helmfile_1.yaml.part.0": {shared  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile_1.yaml.part.0":
- 0: 
- 1: environments:
- 2:   development: {}
- 3:   shared: {}
-
 merged environment: &{shared  map[] map[]}
-first-pass rendering starting for "helmfile_1.yaml.part.1": inherited=&{shared  map[] map[]}, overrode=<nil>
-first-pass uses: &{shared  map[] map[]}
-first-pass rendering output of "helmfile_1.yaml.part.1":
- 0: releases:
- 1: - name: logging
- 2:   chart: incubator/raw
- 3:   namespace: kube-system
- 4: 
- 5: - name: kubernetes-external-secrets
- 6:   chart: incubator/raw
- 7:   namespace: kube-system
- 8:   needs:
- 9:   - kube-system/logging
-10: 
-11: - name: external-secrets
-12:   chart: incubator/raw
-13:   namespace: default
-14:   labels:
-15:     app: test
-16:   needs:
-17:   - kube-system/kubernetes-external-secrets
-18: 
-19: - name: my-release
-20:   chart: incubator/raw
-21:   namespace: default
-22:   labels:
-23:     app: test
-24:   needs:
-25:   - default/external-secrets
-26: 
-27: 
-28: # Disabled releases are treated as missing
-29: - name: disabled
-30:   chart: incubator/raw
-31:   namespace: kube-system
-32:   installed: false
-33: 
-34: - name: test2
-35:   chart: incubator/raw
-36:   needs:
-37:   - kube-system/disabled
-38: 
-39: - name: test3
-40:   chart: incubator/raw
-41:   needs:
-42:   - test2
-43: 
-
-first-pass produced: &{shared  map[] map[]}
-first-pass rendering result of "helmfile_1.yaml.part.1": {shared  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile_1.yaml.part.1":
- 0: releases:
- 1: - name: logging
- 2:   chart: incubator/raw
- 3:   namespace: kube-system
- 4: 
- 5: - name: kubernetes-external-secrets
- 6:   chart: incubator/raw
- 7:   namespace: kube-system
- 8:   needs:
- 9:   - kube-system/logging
-10: 
-11: - name: external-secrets
-12:   chart: incubator/raw
-13:   namespace: default
-14:   labels:
-15:     app: test
-16:   needs:
-17:   - kube-system/kubernetes-external-secrets
-18: 
-19: - name: my-release
-20:   chart: incubator/raw
-21:   namespace: default
-22:   labels:
-23:     app: test
-24:   needs:
-25:   - default/external-secrets
-26: 
-27: 
-28: # Disabled releases are treated as missing
-29: - name: disabled
-30:   chart: incubator/raw
-31:   namespace: kube-system
-32:   installed: false
-33: 
-34: - name: test2
-35:   chart: incubator/raw
-36:   needs:
-37:   - kube-system/disabled
-38: 
-39: - name: test3
-40:   chart: incubator/raw
-41:   needs:
-42:   - test2
-43: 
-
 merged environment: &{shared  map[] map[]}
 WARNING: release test2 needs disabled, but disabled is not installed due to installed: false. Either mark disabled as installed or remove disabled from test2's needs
 changing working directory back to "/path/to"
 processing file "helmfile_2.yaml" in directory "/path/to/helmfile.d"
 changing working directory to "/path/to/helmfile.d"
-first-pass rendering starting for "helmfile_2.yaml.part.0": inherited=&{shared  map[] map[]}, overrode=<nil>
-first-pass uses: &{shared  map[] map[]}
-first-pass rendering output of "helmfile_2.yaml.part.0":
- 0: 
- 1: environments:
- 2:   test: {}
- 3:   shared: {}
-
-first-pass produced: &{shared  map[] map[]}
-first-pass rendering result of "helmfile_2.yaml.part.0": {shared  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile_2.yaml.part.0":
- 0: 
- 1: environments:
- 2:   test: {}
- 3:   shared: {}
-
 merged environment: &{shared  map[] map[]}
-first-pass rendering starting for "helmfile_2.yaml.part.1": inherited=&{shared  map[] map[]}, overrode=<nil>
-first-pass uses: &{shared  map[] map[]}
-first-pass rendering output of "helmfile_2.yaml.part.1":
- 0: repositories:
- 1: - name: bitnami
- 2:   url: https://charts.bitnami.com/bitnami
- 3: 
- 4: releases:
- 5: - name: cache
- 6:   namespace: my-app
- 7:   chart: bitnami/redis
- 8:   version: 17.0.7
- 9:   labels:
-10:     app: test
-11: 
-12: - name: database
-13:   namespace: my-app
-14:   chart: bitnami/postgres
-15:   version: 11.6.22
-16: 
-
-first-pass produced: &{shared  map[] map[]}
-first-pass rendering result of "helmfile_2.yaml.part.1": {shared  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile_2.yaml.part.1":
- 0: repositories:
- 1: - name: bitnami
- 2:   url: https://charts.bitnami.com/bitnami
- 3: 
- 4: releases:
- 5: - name: cache
- 6:   namespace: my-app
- 7:   chart: bitnami/redis
- 8:   version: 17.0.7
- 9:   labels:
-10:     app: test
-11: 
-12: - name: database
-13:   namespace: my-app
-14:   chart: bitnami/postgres
-15:   version: 11.6.22
-16: 
-
 merged environment: &{shared  map[] map[]}
 changing working directory back to "/path/to"
 processing file "helmfile_3.yaml" in directory "/path/to/helmfile.d"
 changing working directory to "/path/to/helmfile.d"
-first-pass rendering starting for "helmfile_3.yaml.part.0": inherited=&{shared  map[] map[]}, overrode=<nil>
-first-pass uses: &{shared  map[] map[]}
-first-pass rendering output of "helmfile_3.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: global
- 3:   chart: incubator/raw
- 4:   namespace: kube-system
- 5: 
-
-first-pass produced: &{shared  map[] map[]}
-first-pass rendering result of "helmfile_3.yaml.part.0": {shared  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile_3.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: global
- 3:   chart: incubator/raw
- 4:   namespace: kube-system
- 5: 
-
 merged environment: &{shared  map[] map[]}
 changing working directory back to "/path/to"