diff --git a/cmd/tap.go b/cmd/tap.go
index 86ee058a2..f8edec061 100644
--- a/cmd/tap.go
+++ b/cmd/tap.go
@@ -62,4 +62,5 @@ func init() {
 	tapCmd.Flags().Bool(configStructs.TelemetryEnabledLabel, defaultTapConfig.Telemetry.Enabled, "Enable/disable Telemetry")
 	tapCmd.Flags().Bool(configStructs.ResourceGuardEnabledLabel, defaultTapConfig.ResourceGuard.Enabled, "Enable/disable resource guard")
 	tapCmd.Flags().Bool(configStructs.WatchdogEnabled, defaultTapConfig.Watchdog.Enabled, "Enable/disable watchdog")
+	tapCmd.Flags().String(configStructs.HelmChartPathLabel, defaultTapConfig.Release.HelmChartPath, "Path to a local Helm chart folder (overrides the remote Helm repo)")
 }
diff --git a/config/configStructs/tapConfig.go b/config/configStructs/tapConfig.go
index 01f76ed62..e49da8f9d 100644
--- a/config/configStructs/tapConfig.go
+++ b/config/configStructs/tapConfig.go
@@ -45,6 +45,7 @@ const (
 	PcapDumpEnabled              = "enabled"
 	PcapTime                     = "time"
 	WatchdogEnabled              = "watchdogEnabled"
+	HelmChartPathLabel           = "release-helmChartPath"
 )
 
 type ResourceLimitsHub struct {
@@ -211,6 +212,7 @@ type ReleaseConfig struct {
 	Repo      string `yaml:"repo" json:"repo" default:"https://helm.kubeshark.com"`
 	Name      string `yaml:"name" json:"name" default:"kubeshark"`
 	Namespace string `yaml:"namespace" json:"namespace" default:"default"`
+	HelmChartPath string `yaml:"helmChartPath" json:"helmChartPath" default:""`
 }
 
 type TelemetryConfig struct {
diff --git a/kubernetes/helm/helm.go b/kubernetes/helm/helm.go
index 21b0f7317..704184f89 100644
--- a/kubernetes/helm/helm.go
+++ b/kubernetes/helm/helm.go
@@ -67,7 +67,10 @@ func (h *Helm) Install() (rel *release.Release, err error) {
 	client.Namespace = h.releaseNamespace
 	client.ReleaseName = h.releaseName
 
-	chartPath := os.Getenv(fmt.Sprintf("%s_HELM_CHART_PATH", strings.ToUpper(misc.Program)))
+	chartPath := config.Config.Tap.Release.HelmChartPath
+	if chartPath == "" {
+		chartPath = os.Getenv(fmt.Sprintf("%s_HELM_CHART_PATH", strings.ToUpper(misc.Program)))
+	}
 	if chartPath == "" {
 		var chartURL string
 		chartURL, err = repo.FindChartInRepoURL(h.repo, h.releaseName, "", "", "", "", getter.All(&cli.EnvSettings{}))
diff --git a/manifests/complete.yaml b/manifests/complete.yaml
index b0235c21e..2ea0b364f 100644
--- a/manifests/complete.yaml
+++ b/manifests/complete.yaml
@@ -209,8 +209,10 @@ data:
         proxy_set_header  Authorization $http_authorization;
         proxy_pass_header Authorization;
         proxy_connect_timeout 4s;
-        proxy_read_timeout 120s;
-        proxy_send_timeout 12s;
+        # Disable buffering for gRPC/Connect streaming
+        client_max_body_size 0;
+        proxy_request_buffering off;
+        proxy_buffering off;
         proxy_pass_request_headers      on;
       }