diff --git a/bitnami/kubeapps/Chart.yaml b/bitnami/kubeapps/Chart.yaml
index 8702e0f80d..b363ead07a 100644
--- a/bitnami/kubeapps/Chart.yaml
+++ b/bitnami/kubeapps/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: kubeapps
-version: 1.6.2
-appVersion: v1.3.2
+version: 1.7.0
+appVersion: v1.4.0
 description: Kubeapps is a dashboard for your Kubernetes cluster that makes it easy to deploy and manage applications in your cluster using Helm
 icon: https://raw.githubusercontent.com/kubeapps/kubeapps/master/docs/img/logo.png
 keywords:
diff --git a/bitnami/kubeapps/templates/apprepositories.yaml b/bitnami/kubeapps/templates/apprepositories.yaml
index b681bb2a21..a0d17e51ab 100644
--- a/bitnami/kubeapps/templates/apprepositories.yaml
+++ b/bitnami/kubeapps/templates/apprepositories.yaml
@@ -4,11 +4,19 @@ kind: AppRepository
 metadata:
   name: {{ .name }}
   annotations:
+{{- if semverCompare ">=2.14.0" $.Capabilities.TillerVersion.SemVer }}
+    # Using the hook pre-install because since Helm v2.14 the crd-install
+    # hook should be used only for CRDs and the issues related to install
+    # Custom Resources have been already fixed
+    # https://github.com/helm/helm/issues/5756#issuecomment-493653454
+    "helm.sh/hook": pre-install
+{{- else }}
     # Using the hook crd-install to avoid issue w/Helm v1.11
     # https://github.com/kubeapps/kubeapps/pull/955#pullrequestreview-200764260
     "helm.sh/hook": crd-install
     # Make sure this runs after the AppRepository CRD install
     "helm.sh/hook-weight": "10"
+{{- end }}
   labels:
     app: {{ template "kubeapps.apprepository.fullname" $ }}
     chart: {{ template "kubeapps.chart" $ }}
diff --git a/bitnami/kubeapps/templates/apprepository-crd.yaml b/bitnami/kubeapps/templates/apprepository-crd.yaml
index 8f41324812..ba1f07a2cb 100644
--- a/bitnami/kubeapps/templates/apprepository-crd.yaml
+++ b/bitnami/kubeapps/templates/apprepository-crd.yaml
@@ -14,6 +14,7 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   group: kubeapps.com
+  scope: Namespaced
   names:
     kind: AppRepository
     plural: apprepositories
diff --git a/bitnami/kubeapps/values.yaml b/bitnami/kubeapps/values.yaml
index 0a62f20ad0..91510b601c 100644
--- a/bitnami/kubeapps/values.yaml
+++ b/bitnami/kubeapps/values.yaml
@@ -99,7 +99,7 @@ apprepository:
   image:
     registry: docker.io
     repository: bitnami/kubeapps-apprepository-controller
-    tag: 1.3.2
+    tag: 1.4.0
   # Image used to perform chart repository syncs
   syncImage:
     registry: docker.io
@@ -154,7 +154,7 @@ tillerProxy:
   image:
     registry: docker.io
     repository: bitnami/kubeapps-tiller-proxy
-    tag: 1.3.2
+    tag: 1.4.0
   service:
     port: 8080
   host: tiller-deploy.kube-system:44134
@@ -216,7 +216,7 @@ dashboard:
   image:
     registry: docker.io
     repository: bitnami/kubeapps-dashboard
-    tag: 1.3.2
+    tag: 1.4.0
   service:
     port: 8080
   livenessProbe: