diff --git a/pkg/state/state.go b/pkg/state/state.go
index 4eddbd04..9c9422d5 100644
--- a/pkg/state/state.go
+++ b/pkg/state/state.go
@@ -972,6 +972,10 @@ func (st *HelmState) PrepareCharts(helm helmexec.Interface, dir string, concurre
 						pathElems = append(pathElems, release.Namespace)
 					}
 
+					if release.KubeContext != "" {
+						pathElems = append(pathElems, release.KubeContext)
+					}
+
 					chartVersion := "latest"
 					if release.Version != "" {
 						chartVersion = release.Version