diff --git a/bitnami/kubeapps/Chart.lock b/bitnami/kubeapps/Chart.lock
index 69d826360..93e7960b8 100644
--- a/bitnami/kubeapps/Chart.lock
+++ b/bitnami/kubeapps/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: redis
   repository: https://charts.bitnami.com/bitnami
-  version: 16.5.5
+  version: 16.6.0
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
   version: 11.1.9
 - name: common
   repository: https://charts.bitnami.com/bitnami
   version: 1.12.0
-digest: sha256:f783111990f84891141da1110b8035e18f5a3c695154d4fc18cabe57aea62c67
-generated: "2022-03-22T11:55:06.325985724Z"
+digest: sha256:32a3323fa6cbd66735a7cf7fb5d63e1bb25b84c7a791b0b15937b7ac0853367d
+generated: "2022-03-24T17:02:51.423514893Z"
diff --git a/bitnami/kubeapps/Chart.yaml b/bitnami/kubeapps/Chart.yaml
index cb84fea7d..82f62e32b 100644
--- a/bitnami/kubeapps/Chart.yaml
+++ b/bitnami/kubeapps/Chart.yaml
@@ -30,4 +30,4 @@ maintainers:
 name: kubeapps
 sources:
   - https://github.com/kubeapps/kubeapps
-version: 8.0.1
+version: 8.0.2
diff --git a/bitnami/kubeapps/README.md b/bitnami/kubeapps/README.md
index e8f5fdf56..f6bec7148 100644
--- a/bitnami/kubeapps/README.md
+++ b/bitnami/kubeapps/README.md
@@ -7,7 +7,7 @@ Kubeapps is a web-based UI for launching and managing applications on Kubernetes
 [Overview of Kubeapps](https://kubeapps.com)
 
 
-
+                           
 ## TL;DR
 
 ```bash
@@ -1173,4 +1173,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.
\ No newline at end of file
diff --git a/bitnami/kubeapps/templates/frontend/service.yaml b/bitnami/kubeapps/templates/frontend/service.yaml
index d473220b6..19161c6e4 100644
--- a/bitnami/kubeapps/templates/frontend/service.yaml
+++ b/bitnami/kubeapps/templates/frontend/service.yaml
@@ -46,7 +46,7 @@ spec:
       {{- end }}
       {{- if and (or (eq .Values.frontend.service.type "NodePort") (eq .Values.frontend.service.type "LoadBalancer")) (not (empty .Values.frontend.service.nodePorts.http)) }}
       nodePort: {{ .Values.frontend.service.nodePorts.http }}
-      {{- else }}
+      {{- else if eq .Values.frontend.service.type "ClusterIP" }}
       nodePort: null
       {{- end }}
     {{- if .Values.frontend.service.extraPorts }}
diff --git a/bitnami/kubeapps/values.yaml b/bitnami/kubeapps/values.yaml
index 2405eecb5..b2cbaf4b4 100644
--- a/bitnami/kubeapps/values.yaml
+++ b/bitnami/kubeapps/values.yaml
@@ -190,7 +190,7 @@ frontend:
   image:
     registry: docker.io
     repository: bitnami/nginx
-    tag: 1.21.6-debian-10-r53
+    tag: 1.21.6-debian-10-r55
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
     ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -506,7 +506,7 @@ dashboard:
   image:
     registry: docker.io
     repository: bitnami/kubeapps-dashboard
-    tag: 2.4.3-debian-10-r33
+    tag: 2.4.3-debian-10-r36
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
     ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -1668,7 +1668,7 @@ authProxy:
   image:
     registry: docker.io
     repository: bitnami/oauth2-proxy
-    tag: 7.2.1-debian-10-r87
+    tag: 7.2.1-debian-10-r90
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
     ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -1800,7 +1800,7 @@ pinnipedProxy:
   image:
     registry: docker.io
     repository: bitnami/kubeapps-pinniped-proxy
-    tag: 2.4.3-debian-10-r38
+    tag: 2.4.3-debian-10-r40
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
     ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -1954,7 +1954,7 @@ rbac:
 testImage:
   registry: docker.io
   repository: bitnami/nginx
-  tag: 1.21.6-debian-10-r53
+  tag: 1.21.6-debian-10-r55
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -2060,7 +2060,7 @@ kubeappsapis:
   image:
     registry: docker.io
     repository: bitnami/kubeapps-apis
-    tag: 2.4.3-debian-10-r40
+    tag: 2.4.3-debian-10-r42
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
     ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images