diff --git a/charts/mlrun-ce/Chart.yaml b/charts/mlrun-ce/Chart.yaml
index 98b2ee96..7c72863b 100644
--- a/charts/mlrun-ce/Chart.yaml
+++ b/charts/mlrun-ce/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mlrun-ce
-version: 0.6.4-rc10
+version: 0.6.4-rc11
 description: MLRun Open Source Stack
 home: https://iguazio.com
 icon: https://www.iguazio.com/wp-content/uploads/2019/10/Iguazio-Logo.png
diff --git a/charts/mlrun-ce/templates/aws/aws_ingress.yaml b/charts/mlrun-ce/templates/aws/aws_ingress.yaml
index 66142fb2..b3a8f66e 100644
--- a/charts/mlrun-ce/templates/aws/aws_ingress.yaml
+++ b/charts/mlrun-ce/templates/aws/aws_ingress.yaml
@@ -1,4 +1,4 @@
-{{- if and (eq .Values.global.infrastructure.provider "aws") (eq .Values.global.infrastructure.kind "cloud") }}
+{{- if and (eq .Values.global.infrastructure.kind "aws") (eq .Values.global.infrastructure.provider "eks") }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -12,8 +12,8 @@ metadata:
   {{- if .Values.global.infrastructure.loadBalancerName }}
     alb.ingress.kubernetes.io/load-balancer-name: {{ .Values.global.infrastructure.loadBalancerName }}
   {{- end }}
-  {{- if .Values.global.domainNameCertificate }}
-    alb.ingress.kubernetes.io/certificate-arn: {{ .Values.global.domainNameCertificate }}
+  {{- if .Values.global.infrastructure.aws.domainNameCertificate }}
+    alb.ingress.kubernetes.io/certificate-arn: {{ .Values.global.infrastructure.aws.domainNameCertificate }}
     alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS": 443}]'
     alb.ingress.kubernetes.io/ssl-redirect: '443'
   {{- else }}
diff --git a/charts/mlrun-ce/values.yaml b/charts/mlrun-ce/values.yaml
index 4deda66e..c48c52bb 100644
--- a/charts/mlrun-ce/values.yaml
+++ b/charts/mlrun-ce/values.yaml
@@ -9,13 +9,16 @@ global:
     dashboard:
       nodePort: 30050
   infrastructure:
-    kind: lab
+    # Defines infra flavour, for instance: standalone, onprem, aws, azure, gcp...
+    kind: standalone
+    # Defines k8s flavour, for instance: eks, aks, gcp, kubespray, openshift, rancher, minikube...
     provider: ~
     inboundCidrs: ~
     loadBalancerName: ~
     aws:
       bucketName: ~
-      s3NonAnonymous: ~
+      s3NonAnonymous: True
+      domainNameCertificate: ~
 
 nuclio:
   # coupled with mlrun.nuclio.dashboardName template in mlrun chart