diff --git a/fleetconfig-controller/charts/fleetconfig-controller/README.md b/fleetconfig-controller/charts/fleetconfig-controller/README.md
index 806b6940..bc22da6a 100644
--- a/fleetconfig-controller/charts/fleetconfig-controller/README.md
+++ b/fleetconfig-controller/charts/fleetconfig-controller/README.md
@@ -105,25 +105,25 @@ Refer to the [Multicluster Controlplane configuration](https://github.com/open-c
 
 ### fleetconfig-controller parameters
 
-| Name                                                | Description                                                                                                                    | Value                                                    |
-| --------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------- |
-| `kubernetesProvider`                                | Kubernetes provider of the cluster that fleetconfig-controller will be installed on. Valid values are "Generic", "EKS", "GKE". | `Generic`                                                |
-| `replicas`                                          | fleetconfig-controller replica count                                                                                           | `1`                                                      |
-| `imageRegistry`                                     | Image registry                                                                                                                 | `""`                                                     |
-| `image.repository`                                  | Image repository                                                                                                               | `quay.io/open-cluster-management/fleetconfig-controller` |
-| `image.tag`                                         | Image tag                                                                                                                      | `v0.0.3`                                                 |
-| `image.pullPolicy`                                  | Image pull policy                                                                                                              | `IfNotPresent`                                           |
-| `imagePullSecrets`                                  | Image pull secrets                                                                                                             | `[]`                                                     |
-| `serviceAccount.annotations`                        | Annotations to add to the service account                                                                                      | `{}`                                                     |
-| `containerSecurityContext.allowPrivilegeEscalation` | allowPrivilegeEscalation                                                                                                       | `false`                                                  |
-| `containerSecurityContext.capabilities.drop`        | capabilities to drop                                                                                                           | `["ALL"]`                                                |
-| `containerSecurityContext.runAsNonRoot`             | runAsNonRoot                                                                                                                   | `true`                                                   |
-| `resources.limits.cpu`                              | fleetconfig controller's cpu limit                                                                                             | `500m`                                                   |
-| `resources.limits.memory`                           | fleetconfig controller's memory limit                                                                                          | `256Mi`                                                  |
-| `resources.requests.cpu`                            | fleetconfig controller's cpu request                                                                                           | `100m`                                                   |
-| `resources.requests.memory`                         | fleetconfig controller's memory request                                                                                        | `256Mi`                                                  |
-| `healthCheck.port`                                  | port the liveness & readiness probes are bound to                                                                              | `9440`                                                   |
-| `kubernetesClusterDomain`                           | kubernetes cluster domain                                                                                                      | `cluster.local`                                          |
+| Name                                                | Description                                                                                                                            | Value                                                    |
+| --------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------- |
+| `kubernetesProvider`                                | Kubernetes provider of the cluster that fleetconfig-controller will be installed on. Valid values are "Generic", "EKS", "GKE-Ingress". | `Generic`                                                |
+| `replicas`                                          | fleetconfig-controller replica count                                                                                                   | `1`                                                      |
+| `imageRegistry`                                     | Image registry                                                                                                                         | `""`                                                     |
+| `image.repository`                                  | Image repository                                                                                                                       | `quay.io/open-cluster-management/fleetconfig-controller` |
+| `image.tag`                                         | Image tag                                                                                                                              | `v0.0.3`                                                 |
+| `image.pullPolicy`                                  | Image pull policy                                                                                                                      | `IfNotPresent`                                           |
+| `imagePullSecrets`                                  | Image pull secrets                                                                                                                     | `[]`                                                     |
+| `serviceAccount.annotations`                        | Annotations to add to the service account                                                                                              | `{}`                                                     |
+| `containerSecurityContext.allowPrivilegeEscalation` | allowPrivilegeEscalation                                                                                                               | `false`                                                  |
+| `containerSecurityContext.capabilities.drop`        | capabilities to drop                                                                                                                   | `["ALL"]`                                                |
+| `containerSecurityContext.runAsNonRoot`             | runAsNonRoot                                                                                                                           | `true`                                                   |
+| `resources.limits.cpu`                              | fleetconfig controller's cpu limit                                                                                                     | `500m`                                                   |
+| `resources.limits.memory`                           | fleetconfig controller's memory limit                                                                                                  | `256Mi`                                                  |
+| `resources.requests.cpu`                            | fleetconfig controller's cpu request                                                                                                   | `100m`                                                   |
+| `resources.requests.memory`                         | fleetconfig controller's memory request                                                                                                | `256Mi`                                                  |
+| `healthCheck.port`                                  | port the liveness & readiness probes are bound to                                                                                      | `9440`                                                   |
+| `kubernetesClusterDomain`                           | kubernetes cluster domain                                                                                                              | `cluster.local`                                          |
 
 ### cert-manager
 
diff --git a/fleetconfig-controller/charts/fleetconfig-controller/templates/_helpers.tpl b/fleetconfig-controller/charts/fleetconfig-controller/templates/_helpers.tpl
index b0e6ef0e..20ac3074 100644
--- a/fleetconfig-controller/charts/fleetconfig-controller/templates/_helpers.tpl
+++ b/fleetconfig-controller/charts/fleetconfig-controller/templates/_helpers.tpl
@@ -92,11 +92,15 @@ This image has no additional binaries bundled, other than clusteradm.
 {{- define "controller.image" -}}
 {{- $baseImage := printf "%s%s:%s" .Values.imageRegistry .Values.image.repository .Values.image.tag -}}
 {{- $provider := "" -}}
-{{- if and .Values.global .Values.kubernetesProvider -}}
+{{- if and .Values.global .Values.global.kubernetesProvider -}}
+{{- $provider = .Values.global.kubernetesProvider | lower -}}
+{{- else if .Values.kubernetesProvider -}}
 {{- $provider = .Values.kubernetesProvider | lower -}}
 {{- end -}}
-{{- if or (eq $provider "eks") (eq $provider "gke") -}}
+{{- if eq $provider "eks" -}}
 {{- printf "%s-%s" $baseImage $provider -}}
+{{- else if hasPrefix "gke" $provider -}}
+{{- printf "%s-%s" $baseImage "gke" -}}
 {{- else -}}
 {{- $baseImage -}}
 {{- end -}}
diff --git a/fleetconfig-controller/charts/fleetconfig-controller/values.yaml b/fleetconfig-controller/charts/fleetconfig-controller/values.yaml
index e8f0b8d4..5ddc8817 100644
--- a/fleetconfig-controller/charts/fleetconfig-controller/values.yaml
+++ b/fleetconfig-controller/charts/fleetconfig-controller/values.yaml
@@ -233,7 +233,7 @@ topologyResources:
 
 ## @section fleetconfig-controller parameters
 
-## @param kubernetesProvider Kubernetes provider of the cluster that fleetconfig-controller will be installed on. Valid values are "Generic", "EKS", "GKE".
+## @param kubernetesProvider Kubernetes provider of the cluster that fleetconfig-controller will be installed on. Valid values are "Generic", "EKS", "GKE-Ingress".
 kubernetesProvider: "Generic"
 
 ## @param replicas fleetconfig-controller replica count