diff --git a/charts/flyte-core/templates/_helpers.tpl b/charts/flyte-core/templates/_helpers.tpl
index 98a42655e3..b4361a1e47 100755
--- a/charts/flyte-core/templates/_helpers.tpl
+++ b/charts/flyte-core/templates/_helpers.tpl
@@ -102,28 +102,6 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 {{- end -}}
 
-{{- define "flyteagent.name" -}}
-flyteagent
-{{- end -}}
-
-{{- define "flyteagent.selectorLabels" -}}
-app.kubernetes.io/name: {{ template "flyteagent.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{- define "flyteagent.labels" -}}
-{{ include "flyteagent.selectorLabels" . }}
-helm.sh/chart: {{ include "flyte.chart" . }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{- define "flyteagent.podLabels" -}}
-{{ include "flyteagent.labels" . }}
-{{- with .Values.flyteagent.podLabels }}
-{{ toYaml . }}
-{{- end }}
-{{- end -}}
-
 {{- define "flytepropeller.name" -}}
 flytepropeller
 {{- end -}}
diff --git a/charts/flyte-deps/Chart.yaml b/charts/flyte-deps/Chart.yaml
index fbd72a0bc2..ea84c798e7 100644
--- a/charts/flyte-deps/Chart.yaml
+++ b/charts/flyte-deps/Chart.yaml
@@ -11,7 +11,7 @@ dependencies:
   - name: spark-operator
     alias: sparkoperator
     version: 1.1.15
-    repository: https://googlecloudplatform.github.io/spark-on-k8s-operator
+    repository: https://kubeflow.github.io/spark-operator
     condition: sparkoperator.enabled
   - name: dask-kubernetes-operator
     alias: daskoperator
diff --git a/charts/flyte-deps/README.md b/charts/flyte-deps/README.md
index 6a5eb13e4f..014e19c251 100644
--- a/charts/flyte-deps/README.md
+++ b/charts/flyte-deps/README.md
@@ -9,8 +9,8 @@ A Helm chart for Flyte dependency
 | Repository | Name | Version |
 |------------|------|---------|
 | https://charts.bitnami.com/bitnami | contour | 7.10.1 |
-| https://googlecloudplatform.github.io/spark-on-k8s-operator | sparkoperator(spark-operator) | 1.1.15 |
 | https://helm.dask.org | daskoperator(dask-kubernetes-operator) | 2022.12.0 |
+| https://kubeflow.github.io/spark-operator | sparkoperator(spark-operator) | 1.1.15 |
 | https://kubernetes.github.io/dashboard/ | kubernetes-dashboard | 4.0.2 |
 
 ### SANDBOX INSTALLATION:
diff --git a/charts/flyte/Chart.yaml b/charts/flyte/Chart.yaml
index 0fcfb6679b..daed727185 100644
--- a/charts/flyte/Chart.yaml
+++ b/charts/flyte/Chart.yaml
@@ -15,7 +15,7 @@ dependencies:
   - name: spark-operator
     alias: sparkoperator
     version: 1.1.15
-    repository: https://googlecloudplatform.github.io/spark-on-k8s-operator
+    repository: https://kubeflow.github.io/spark-operator
     condition: sparkoperator.enabled
   - name: dask-kubernetes-operator
     alias: daskoperator
diff --git a/charts/flyte/README.md b/charts/flyte/README.md
index b1f00aa4e8..5ead2db730 100644
--- a/charts/flyte/README.md
+++ b/charts/flyte/README.md
@@ -10,8 +10,8 @@ A Helm chart for Flyte Sandbox
 |------------|------|---------|
 | file://../flyte-core | flyte(flyte-core) | v0.1.10 |
 | https://charts.bitnami.com/bitnami | contour | 7.10.1 |
-| https://googlecloudplatform.github.io/spark-on-k8s-operator | sparkoperator(spark-operator) | 1.1.15 |
 | https://helm.dask.org | daskoperator(dask-kubernetes-operator) | 2022.12.0 |
+| https://kubeflow.github.io/spark-operator | sparkoperator(spark-operator) | 1.1.15 |
 | https://kubernetes.github.io/dashboard/ | kubernetes-dashboard | 4.0.2 |
 
 **NOTE:** Flyte sandbox helm chart is deprecated, From now follow the sandbox [docs](https://docs.flyte.org/en/latest/deployment/sandbox.html) for installing it on cloud
diff --git a/charts/flyteagent/templates/_helpers.tpl b/charts/flyteagent/templates/_helpers.tpl
index 40411a61b9..c8ed80055b 100755
--- a/charts/flyteagent/templates/_helpers.tpl
+++ b/charts/flyteagent/templates/_helpers.tpl
@@ -31,7 +31,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- define "flyteagent.podLabels" -}}
 {{ include "flyteagent.labels" . }}
 {{- with .Values.podLabels }}
-{{- toYaml . }}
+{{ toYaml . }}
 {{- end }}
 {{- end -}}