diff --git a/pkg/app/testdata/app_diff_test/include-needs_with_include-transitive-needs_should_not_fail_on_disabled_direct_need b/pkg/app/testdata/app_diff_test/include-needs_with_include-transitive-needs_should_not_fail_on_disabled_direct_need
index 3b0dd1a0..0462bbee 100644
--- a/pkg/app/testdata/app_diff_test/include-needs_with_include-transitive-needs_should_not_fail_on_disabled_direct_need
+++ b/pkg/app/testdata/app_diff_test/include-needs_with_include-transitive-needs_should_not_fail_on_disabled_direct_need
@@ -102,7 +102,7 @@ second-pass rendering result of "helmfile.yaml.part.0":
 44: 
 
 merged environment: &{default  map[] map[]}
-1 release(s) matching name=test2 found in helmfile.yaml
+2 release(s) matching name=test2 found in helmfile.yaml
 
 processing 2 groups of releases in this order:
 GROUP RELEASES
diff --git a/pkg/app/testdata/app_diff_test/include-needs_with_include-transitive-needs_should_not_fail_on_disabled_transitive_need b/pkg/app/testdata/app_diff_test/include-needs_with_include-transitive-needs_should_not_fail_on_disabled_transitive_need
index 66c9f0bd..d9ccc993 100644
--- a/pkg/app/testdata/app_diff_test/include-needs_with_include-transitive-needs_should_not_fail_on_disabled_transitive_need
+++ b/pkg/app/testdata/app_diff_test/include-needs_with_include-transitive-needs_should_not_fail_on_disabled_transitive_need
@@ -102,7 +102,7 @@ second-pass rendering result of "helmfile.yaml.part.0":
 44: 
 
 merged environment: &{default  map[] map[]}
-1 release(s) matching name=test3 found in helmfile.yaml
+3 release(s) matching name=test3 found in helmfile.yaml
 
 processing 3 groups of releases in this order:
 GROUP RELEASES
diff --git a/pkg/app/testdata/app_diff_test/include-transitive-needs_should_not_fail_on_disabled_transitive_need b/pkg/app/testdata/app_diff_test/include-transitive-needs_should_not_fail_on_disabled_transitive_need
index 66c9f0bd..d9ccc993 100644
--- a/pkg/app/testdata/app_diff_test/include-transitive-needs_should_not_fail_on_disabled_transitive_need
+++ b/pkg/app/testdata/app_diff_test/include-transitive-needs_should_not_fail_on_disabled_transitive_need
@@ -102,7 +102,7 @@ second-pass rendering result of "helmfile.yaml.part.0":
 44: 
 
 merged environment: &{default  map[] map[]}
-1 release(s) matching name=test3 found in helmfile.yaml
+3 release(s) matching name=test3 found in helmfile.yaml
 
 processing 3 groups of releases in this order:
 GROUP RELEASES
diff --git a/pkg/app/testdata/app_diff_test/no-hooks b/pkg/app/testdata/app_diff_test/no-hooks
index 45db6300..03246b43 100644
--- a/pkg/app/testdata/app_diff_test/no-hooks
+++ b/pkg/app/testdata/app_diff_test/no-hooks
@@ -104,11 +104,9 @@ second-pass rendering result of "helmfile.yaml.part.0":
 merged environment: &{default  map[] map[]}
 2 release(s) matching app=test found in helmfile.yaml
 
-processing 2 groups of releases in this order:
+processing 1 groups of releases in this order:
 GROUP RELEASES
-1     default/default/external-secrets
-2     default/default/my-release
+1     default/default/external-secrets, default/default/my-release
 
-processing releases in group 1/2: default/default/external-secrets
-processing releases in group 2/2: default/default/my-release
+processing releases in group 1/1: default/default/external-secrets, default/default/my-release
 changing working directory back to "/path/to"
diff --git a/pkg/app/testdata/app_diff_test/skip-needs b/pkg/app/testdata/app_diff_test/skip-needs
index 45db6300..03246b43 100644
--- a/pkg/app/testdata/app_diff_test/skip-needs
+++ b/pkg/app/testdata/app_diff_test/skip-needs
@@ -104,11 +104,9 @@ second-pass rendering result of "helmfile.yaml.part.0":
 merged environment: &{default  map[] map[]}
 2 release(s) matching app=test found in helmfile.yaml
 
-processing 2 groups of releases in this order:
+processing 1 groups of releases in this order:
 GROUP RELEASES
-1     default/default/external-secrets
-2     default/default/my-release
+1     default/default/external-secrets, default/default/my-release
 
-processing releases in group 1/2: default/default/external-secrets
-processing releases in group 2/2: default/default/my-release
+processing releases in group 1/1: default/default/external-secrets, default/default/my-release
 changing working directory back to "/path/to"
diff --git a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true/log b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true/log
index 843004d5..027051f2 100644
--- a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true/log
+++ b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true/log
@@ -60,7 +60,7 @@ second-pass rendering result of "helmfile.yaml.part.0":
 23: 
 
 merged environment: &{default  map[] map[]}
-2 release(s) matching app=test found in helmfile.yaml
+3 release(s) matching app=test found in helmfile.yaml
 
 Affected releases are:
   external-secrets (incubator/raw) UPDATED
diff --git a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log
index 44a03326..9ee10c97 100644
--- a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log
+++ b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log
@@ -60,7 +60,7 @@ second-pass rendering result of "helmfile.yaml.part.0":
 23: 
 
 merged environment: &{default  map[] map[]}
-2 release(s) matching app=test found in helmfile.yaml
+3 release(s) matching app=test found in helmfile.yaml
 
 Affected releases are:
   external-secrets (incubator/raw) UPDATED
@@ -75,13 +75,15 @@ GROUP RELEASES
 invoking preapply hooks for releases in group 1/3: default/default/my-release
 invoking preapply hooks for releases in group 2/3: default/default/external-secrets
 invoking preapply hooks for releases in group 3/3: default/kube-system/kubernetes-external-secrets
-processing 2 groups of releases in this order:
+processing 3 groups of releases in this order:
 GROUP RELEASES
-1     default/default/external-secrets
-2     default/default/my-release
+1     default/kube-system/kubernetes-external-secrets
+2     default/default/external-secrets
+3     default/default/my-release
 
-processing releases in group 1/2: default/default/external-secrets
-processing releases in group 2/2: default/default/my-release
+processing releases in group 1/3: default/kube-system/kubernetes-external-secrets
+processing releases in group 2/3: default/default/external-secrets
+processing releases in group 3/3: default/default/my-release
 
 UPDATED RELEASES:
 NAME               CHART           VERSION   DURATION
diff --git a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log
index 5edfc5f5..66e402cd 100644
--- a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log
+++ b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log
@@ -62,7 +62,7 @@ second-pass rendering result of "helmfile.yaml.part.0":
 24: 
 
 merged environment: &{default  map[] map[]}
-2 release(s) matching app=test found in helmfile.yaml
+3 release(s) matching app=test found in helmfile.yaml
 
 Affected releases are:
   external-secrets (incubator/raw) UPDATED
@@ -83,13 +83,15 @@ GROUP RELEASES
 1     default/kube-system/kubernetes-external-secrets
 
 processing releases in group 1/1: default/kube-system/kubernetes-external-secrets
-processing 2 groups of releases in this order:
+processing 3 groups of releases in this order:
 GROUP RELEASES
-1     default/default/external-secrets
-2     default/default/my-release
+1     default/kube-system/kubernetes-external-secrets
+2     default/default/external-secrets
+3     default/default/my-release
 
-processing releases in group 1/2: default/default/external-secrets
-processing releases in group 2/2: default/default/my-release
+processing releases in group 1/3: default/kube-system/kubernetes-external-secrets
+processing releases in group 2/3: default/default/external-secrets
+processing releases in group 3/3: default/default/my-release
 
 UPDATED RELEASES:
 NAME               CHART           VERSION   DURATION
diff --git a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log
index dbb96067..78602608 100644
--- a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log
+++ b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log
@@ -62,7 +62,7 @@ second-pass rendering result of "helmfile.yaml.part.0":
 24: 
 
 merged environment: &{default  map[] map[]}
-2 release(s) matching app=test found in helmfile.yaml
+3 release(s) matching app=test found in helmfile.yaml
 
 Affected releases are:
   external-secrets (incubator/raw) UPDATED
@@ -77,13 +77,15 @@ GROUP RELEASES
 invoking preapply hooks for releases in group 1/3: default/default/my-release
 invoking preapply hooks for releases in group 2/3: default/default/external-secrets
 invoking preapply hooks for releases in group 3/3: default/kube-system/kubernetes-external-secrets
-processing 2 groups of releases in this order:
+processing 3 groups of releases in this order:
 GROUP RELEASES
-1     default/default/external-secrets
-2     default/default/my-release
+1     default/kube-system/kubernetes-external-secrets
+2     default/default/external-secrets
+3     default/default/my-release
 
-processing releases in group 1/2: default/default/external-secrets
-processing releases in group 2/2: default/default/my-release
+processing releases in group 1/3: default/kube-system/kubernetes-external-secrets
+processing releases in group 2/3: default/default/external-secrets
+processing releases in group 3/3: default/default/my-release
 
 UPDATED RELEASES:
 NAME               CHART           VERSION   DURATION
diff --git a/pkg/app/testdata/testapply_2/skip-needs=true/log b/pkg/app/testdata/testapply_2/skip-needs=true/log
index 2dc7d066..254c692c 100644
--- a/pkg/app/testdata/testapply_2/skip-needs=true/log
+++ b/pkg/app/testdata/testapply_2/skip-needs=true/log
@@ -66,20 +66,16 @@ Affected releases are:
   external-secrets (incubator/raw) UPDATED
   my-release (incubator/raw) UPDATED
 
-invoking preapply hooks for 2 groups of releases in this order:
+invoking preapply hooks for 1 groups of releases in this order:
 GROUP RELEASES
-1     default/default/my-release
-2     default/default/external-secrets
+1     default/default/external-secrets, default/default/my-release
 
-invoking preapply hooks for releases in group 1/2: default/default/my-release
-invoking preapply hooks for releases in group 2/2: default/default/external-secrets
-processing 2 groups of releases in this order:
+invoking preapply hooks for releases in group 1/1: default/default/external-secrets, default/default/my-release
+processing 1 groups of releases in this order:
 GROUP RELEASES
-1     default/default/external-secrets
-2     default/default/my-release
+1     default/default/external-secrets, default/default/my-release
 
-processing releases in group 1/2: default/default/external-secrets
-processing releases in group 2/2: default/default/my-release
+processing releases in group 1/1: default/default/external-secrets, default/default/my-release
 
 UPDATED RELEASES:
 NAME               CHART           VERSION   DURATION
diff --git a/pkg/app/testdata/testapply_2/skip-needs=true_with_no_diff_on_a_release/log b/pkg/app/testdata/testapply_2/skip-needs=true_with_no_diff_on_a_release/log
index 4b29fbd5..6fb1f671 100644
--- a/pkg/app/testdata/testapply_2/skip-needs=true_with_no_diff_on_a_release/log
+++ b/pkg/app/testdata/testapply_2/skip-needs=true_with_no_diff_on_a_release/log
@@ -65,13 +65,11 @@ merged environment: &{default  map[] map[]}
 Affected releases are:
   external-secrets (incubator/raw) UPDATED
 
-invoking preapply hooks for 2 groups of releases in this order:
+invoking preapply hooks for 1 groups of releases in this order:
 GROUP RELEASES
-1     default/default/my-release
-2     default/default/external-secrets
+1     default/default/external-secrets, default/default/my-release
 
-invoking preapply hooks for releases in group 1/2: default/default/my-release
-invoking preapply hooks for releases in group 2/2: default/default/external-secrets
+invoking preapply hooks for releases in group 1/1: default/default/external-secrets, default/default/my-release
 processing 1 groups of releases in this order:
 GROUP RELEASES
 1     default/default/external-secrets
diff --git a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true/log b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true/log
index a0bd7136..67c40113 100644
--- a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true/log
+++ b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true/log
@@ -60,7 +60,7 @@ second-pass rendering result of "helmfile.yaml.part.0":
 23: 
 
 merged environment: &{default  map[] map[]}
-2 release(s) matching app=test found in helmfile.yaml
+3 release(s) matching app=test found in helmfile.yaml
 
 Affected releases are:
   external-secrets (incubator/raw) UPDATED
diff --git a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log
index 43131c53..9fc75ff1 100644
--- a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log
+++ b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log
@@ -60,7 +60,7 @@ second-pass rendering result of "helmfile.yaml.part.0":
 23: 
 
 merged environment: &{default  map[] map[]}
-2 release(s) matching app=test found in helmfile.yaml
+3 release(s) matching app=test found in helmfile.yaml
 
 Affected releases are:
   external-secrets (incubator/raw) UPDATED
@@ -75,13 +75,15 @@ GROUP RELEASES
 invoking preapply hooks for releases in group 1/3: default/my-release
 invoking preapply hooks for releases in group 2/3: default/external-secrets
 invoking preapply hooks for releases in group 3/3: kube-system/kubernetes-external-secrets
-processing 2 groups of releases in this order:
+processing 3 groups of releases in this order:
 GROUP RELEASES
-1     default/external-secrets
-2     default/my-release
+1     kube-system/kubernetes-external-secrets
+2     default/external-secrets
+3     default/my-release
 
-processing releases in group 1/2: default/external-secrets
-processing releases in group 2/2: default/my-release
+processing releases in group 1/3: kube-system/kubernetes-external-secrets
+processing releases in group 2/3: default/external-secrets
+processing releases in group 3/3: default/my-release
 
 UPDATED RELEASES:
 NAME               CHART           VERSION   DURATION
diff --git a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log
index e7b25886..f350c3fe 100644
--- a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log
+++ b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log
@@ -62,7 +62,7 @@ second-pass rendering result of "helmfile.yaml.part.0":
 24: 
 
 merged environment: &{default  map[] map[]}
-2 release(s) matching app=test found in helmfile.yaml
+3 release(s) matching app=test found in helmfile.yaml
 
 Affected releases are:
   external-secrets (incubator/raw) UPDATED
@@ -83,13 +83,15 @@ GROUP RELEASES
 1     kube-system/kubernetes-external-secrets
 
 processing releases in group 1/1: kube-system/kubernetes-external-secrets
-processing 2 groups of releases in this order:
+processing 3 groups of releases in this order:
 GROUP RELEASES
-1     default/external-secrets
-2     default/my-release
+1     kube-system/kubernetes-external-secrets
+2     default/external-secrets
+3     default/my-release
 
-processing releases in group 1/2: default/external-secrets
-processing releases in group 2/2: default/my-release
+processing releases in group 1/3: kube-system/kubernetes-external-secrets
+processing releases in group 2/3: default/external-secrets
+processing releases in group 3/3: default/my-release
 
 UPDATED RELEASES:
 NAME               CHART           VERSION   DURATION
diff --git a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log
index 0bce15c4..e8f4add6 100644
--- a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log
+++ b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log
@@ -62,7 +62,7 @@ second-pass rendering result of "helmfile.yaml.part.0":
 24: 
 
 merged environment: &{default  map[] map[]}
-2 release(s) matching app=test found in helmfile.yaml
+3 release(s) matching app=test found in helmfile.yaml
 
 Affected releases are:
   external-secrets (incubator/raw) UPDATED
@@ -77,13 +77,15 @@ GROUP RELEASES
 invoking preapply hooks for releases in group 1/3: default/my-release
 invoking preapply hooks for releases in group 2/3: default/external-secrets
 invoking preapply hooks for releases in group 3/3: kube-system/kubernetes-external-secrets
-processing 2 groups of releases in this order:
+processing 3 groups of releases in this order:
 GROUP RELEASES
-1     default/external-secrets
-2     default/my-release
+1     kube-system/kubernetes-external-secrets
+2     default/external-secrets
+3     default/my-release
 
-processing releases in group 1/2: default/external-secrets
-processing releases in group 2/2: default/my-release
+processing releases in group 1/3: kube-system/kubernetes-external-secrets
+processing releases in group 2/3: default/external-secrets
+processing releases in group 3/3: default/my-release
 
 UPDATED RELEASES:
 NAME               CHART           VERSION   DURATION
diff --git a/pkg/app/testdata/testapply_3/skip-needs=true/log b/pkg/app/testdata/testapply_3/skip-needs=true/log
index d3679939..057854fc 100644
--- a/pkg/app/testdata/testapply_3/skip-needs=true/log
+++ b/pkg/app/testdata/testapply_3/skip-needs=true/log
@@ -66,20 +66,16 @@ Affected releases are:
   external-secrets (incubator/raw) UPDATED
   my-release (incubator/raw) UPDATED
 
-invoking preapply hooks for 2 groups of releases in this order:
+invoking preapply hooks for 1 groups of releases in this order:
 GROUP RELEASES
-1     default/my-release
-2     default/external-secrets
+1     default/external-secrets, default/my-release
 
-invoking preapply hooks for releases in group 1/2: default/my-release
-invoking preapply hooks for releases in group 2/2: default/external-secrets
-processing 2 groups of releases in this order:
+invoking preapply hooks for releases in group 1/1: default/external-secrets, default/my-release
+processing 1 groups of releases in this order:
 GROUP RELEASES
-1     default/external-secrets
-2     default/my-release
+1     default/external-secrets, default/my-release
 
-processing releases in group 1/2: default/external-secrets
-processing releases in group 2/2: default/my-release
+processing releases in group 1/1: default/external-secrets, default/my-release
 
 UPDATED RELEASES:
 NAME               CHART           VERSION   DURATION
diff --git a/pkg/app/testdata/testapply_3/skip-needs=true_with_no_diff_on_a_release/log b/pkg/app/testdata/testapply_3/skip-needs=true_with_no_diff_on_a_release/log
index 5ecba242..0b2bd393 100644
--- a/pkg/app/testdata/testapply_3/skip-needs=true_with_no_diff_on_a_release/log
+++ b/pkg/app/testdata/testapply_3/skip-needs=true_with_no_diff_on_a_release/log
@@ -65,13 +65,11 @@ merged environment: &{default  map[] map[]}
 Affected releases are:
   external-secrets (incubator/raw) UPDATED
 
-invoking preapply hooks for 2 groups of releases in this order:
+invoking preapply hooks for 1 groups of releases in this order:
 GROUP RELEASES
-1     default/my-release
-2     default/external-secrets
+1     default/external-secrets, default/my-release
 
-invoking preapply hooks for releases in group 1/2: default/my-release
-invoking preapply hooks for releases in group 2/2: default/external-secrets
+invoking preapply hooks for releases in group 1/1: default/external-secrets, default/my-release
 processing 1 groups of releases in this order:
 GROUP RELEASES
 1     default/external-secrets