diff --git a/system/kubeapps/Makefile b/system/kubeapps/Makefile
index 69f85cb4..6a743f52 100644
--- a/system/kubeapps/Makefile
+++ b/system/kubeapps/Makefile
@@ -1,15 +1,24 @@
 include ../../hack/app-helm.mk
 
-update:
-	#rm -rf charts
-	#helm repo add bitnami https://charts.bitnami.com/bitnami
-	#helm repo update bitnami
-	#helm pull bitnami/kubeapps --untar --untardir charts
-	#rm -rf charts/kubeapps/charts/postgresql/
+update: update-chart update-dockerfiles
+
+update-chart:
+	rm -rf charts
+	helm repo add bitnami https://charts.bitnami.com/bitnami
+	helm repo update bitnami
+	helm pull bitnami/kubeapps --untar --untardir charts
+	rm -rf charts/kubeapps/charts/postgresql/
+	sed -i 's|{{ include "kubeapps.dashboard.image" . }}|ghcr.io/aenix-io/cozystack/dashboard:latest|g' charts/kubeapps/templates/dashboard/deployment.yaml
+	sed -i 's|{{ include "kubeapps.kubeappsapis.image" . }}|ghcr.io/aenix-io/cozystack/kubeapps-apis:latest|g' charts/kubeapps/templates/kubeappsapis/deployment.yaml
+
+update-dockerfiles:
 	tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/vmware-tanzu/kubeapps  | awk -F'[/^]' 'END{print $$3}') && \
-	wget https://github.com/vmware-tanzu/kubeapps/raw/$${tag}/dashboard/Dockerfile -O images/dashboard/Dockerfile && \
 	wget https://github.com/vmware-tanzu/kubeapps/raw/$${tag}/cmd/kubeapps-apis/Dockerfile -O images/kubeapps-apis/Dockerfile && \
-	patch images/kubeapps-apis/Dockerfile < images/kubeapps-apis/dockerfile.diff
+	patch images/kubeapps-apis/Dockerfile < images/kubeapps-apis/dockerfile.diff && \
+	node_image=$$(wget -O- https://github.com/vmware-tanzu/kubeapps/raw/main/dashboard/Dockerfile | awk '/FROM bitnami\/node/ {print $$2}') && \
+	sed -i "s|FROM .* AS build|FROM $${node_image} AS build|" images/dashboard/Dockerfile && \
+	version=$$(echo "$$tag" | sed 's/^v//') && \
+	sed -i "s/ARG VERSION=.*/ARG VERSION=$${version}/" images/dashboard/Dockerfile
 
 
 image-dashboard:
diff --git a/system/kubeapps/images/dashboard.json b/system/kubeapps/images/dashboard.json
new file mode 100644
index 00000000..077f484c
--- /dev/null
+++ b/system/kubeapps/images/dashboard.json
@@ -0,0 +1,4 @@
+{
+  "containerimage.config.digest": "sha256:f47c270fe3457980e363bff3526d0d04553a83d7a0e480788f4b59e1899924d1",
+  "containerimage.digest": "sha256:c2313673b3f516b309f8048fdad9d4194accf5d9d25e6b622c6704f836e1beda"
+}
\ No newline at end of file
diff --git a/system/kubeapps/images/dashboard/Dockerfile b/system/kubeapps/images/dashboard/Dockerfile
index 952fda04..90bb9ad1 100644
--- a/system/kubeapps/images/dashboard/Dockerfile
+++ b/system/kubeapps/images/dashboard/Dockerfile
@@ -7,6 +7,9 @@ WORKDIR /app
 ARG VERSION=2.9.0
 RUN wget -O- https://github.com/vmware-tanzu/kubeapps/archive/refs/tags/v${VERSION}.tar.gz | tar xzf - --strip-components=2 kubeapps-${VERSION}/dashboard
 
+COPY apple-touch-icon.png favicon-16x16.png favicon-32x32.png favicon.ico mstile-144x144.png mstile-150x150.png mstile-310x150.png mstile-310x310.png mstile-70x70.png safari-pinned-tab.svg public/
+
+RUN sed -i 's/opacity: 0.05;/display: none;/g' src/components/InfoCard/InfoCard.scss
 RUN sed -i 's/"Kubeapps",/"Cozystack",/' lang/en.json
 RUN sed -i 's/Kubeapps/Cozystack/g' public/site.webmanifest
 RUN sed -i 's/Welcome To Kubeapps/Welcome To Cozystack/g' ./src/components/LoginForm/LoginForm.tsx ./src/components/AppList/AppListGrid.tsx ./src/components/AppList/AppList.test.tsx
diff --git a/system/kubeapps/images/dashboard/apple-touch-icon.png b/system/kubeapps/images/dashboard/apple-touch-icon.png
new file mode 100644
index 00000000..39c1ff6e
Binary files /dev/null and b/system/kubeapps/images/dashboard/apple-touch-icon.png differ
diff --git a/system/kubeapps/images/dashboard/favicon-16x16.png b/system/kubeapps/images/dashboard/favicon-16x16.png
new file mode 100644
index 00000000..a3d1fb22
Binary files /dev/null and b/system/kubeapps/images/dashboard/favicon-16x16.png differ
diff --git a/system/kubeapps/images/dashboard/favicon-32x32.png b/system/kubeapps/images/dashboard/favicon-32x32.png
new file mode 100644
index 00000000..b149bda6
Binary files /dev/null and b/system/kubeapps/images/dashboard/favicon-32x32.png differ
diff --git a/system/kubeapps/images/dashboard/favicon.ico b/system/kubeapps/images/dashboard/favicon.ico
new file mode 100644
index 00000000..fc042661
Binary files /dev/null and b/system/kubeapps/images/dashboard/favicon.ico differ
diff --git a/system/kubeapps/images/dashboard/mstile-144x144.png b/system/kubeapps/images/dashboard/mstile-144x144.png
new file mode 100644
index 00000000..622ab2b0
Binary files /dev/null and b/system/kubeapps/images/dashboard/mstile-144x144.png differ
diff --git a/system/kubeapps/images/dashboard/mstile-150x150.png b/system/kubeapps/images/dashboard/mstile-150x150.png
new file mode 100644
index 00000000..70d40bcd
Binary files /dev/null and b/system/kubeapps/images/dashboard/mstile-150x150.png differ
diff --git a/system/kubeapps/images/dashboard/mstile-310x150.png b/system/kubeapps/images/dashboard/mstile-310x150.png
new file mode 100644
index 00000000..03f655f0
Binary files /dev/null and b/system/kubeapps/images/dashboard/mstile-310x150.png differ
diff --git a/system/kubeapps/images/dashboard/mstile-310x310.png b/system/kubeapps/images/dashboard/mstile-310x310.png
new file mode 100644
index 00000000..0faae8a9
Binary files /dev/null and b/system/kubeapps/images/dashboard/mstile-310x310.png differ
diff --git a/system/kubeapps/images/dashboard/mstile-70x70.png b/system/kubeapps/images/dashboard/mstile-70x70.png
new file mode 100644
index 00000000..f59b5aaf
Binary files /dev/null and b/system/kubeapps/images/dashboard/mstile-70x70.png differ
diff --git a/system/kubeapps/images/dashboard/safari-pinned-tab.svg b/system/kubeapps/images/dashboard/safari-pinned-tab.svg
new file mode 100644
index 00000000..d72f1f44
--- /dev/null
+++ b/system/kubeapps/images/dashboard/safari-pinned-tab.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="933.33301"
+   height="933.33301"
+   viewBox="0 0 700 700"
+   preserveAspectRatio="xMidYMid meet"
+   version="1.1"
+   id="svg826"
+   sodipodi:docname="safari-pinned-tab.svg"
+   inkscape:version="1.1.1 (c3084ef, 2021-09-22)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs830" />
+  <sodipodi:namedview
+     id="namedview828"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.77035741"
+     inkscape:cx="436.81023"
+     inkscape:cy="541.95623"
+     inkscape:window-width="1720"
+     inkscape:window-height="1387"
+     inkscape:window-x="1720"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg826" />
+  <rect
+     style="fill:#000000;stroke-width:6.33749"
+     id="rect938"
+     width="700"
+     height="700"
+     x="0"
+     y="-1.7763568e-15" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="m 170.27273,142.84005 c 0,-13.12938 10.41078,-23.77292 23.25562,-23.77292 h 325.57872 c 12.8449,0 23.25558,10.64354 23.25558,23.77292 v 0 c 0,13.12957 -10.41068,23.77302 -23.25558,23.77302 H 193.52835 c -12.84484,0 -23.25562,-10.64345 -23.25562,-23.77302 z m 0,427.91341 c 0,-13.12903 10.41078,-23.77297 23.25562,-23.77297 h 325.57872 c 12.8449,0 23.25558,10.64394 23.25558,23.77297 v 0 c 0,13.12982 -10.41068,23.77298 -23.25558,23.77298 H 193.52835 c -12.84484,0 -23.25562,-10.64316 -23.25562,-23.77298 z M 542.36265,356.79661 c 0,-13.12902 -10.41068,-23.77296 -23.25558,-23.77296 H 193.52835 c -12.84484,0 -23.25562,10.64394 -23.25562,23.77296 v 0 c 0,13.12982 10.41078,23.77298 23.25562,23.77298 h 325.57872 c 12.8449,0 23.25558,-10.64316 23.25558,-23.77298 z"
+     fill="#ffffff"
+     id="path840"
+     style="stroke-width:7.83755" />
+</svg>
diff --git a/system/kubeapps/images/kubeapps-apis.json b/system/kubeapps/images/kubeapps-apis.json
new file mode 100644
index 00000000..1454724b
--- /dev/null
+++ b/system/kubeapps/images/kubeapps-apis.json
@@ -0,0 +1,4 @@
+{
+  "containerimage.config.digest": "sha256:66f229577dbbfe93166e5705d80c3164d9c645b2863f4f2a41b973341ddd4fcd",
+  "containerimage.digest": "sha256:2951e3e6bb318617095b060f7bf7155d08e9be568ebbd04e0555f6205cea06f1"
+}
\ No newline at end of file
diff --git a/system/kubeapps/values.yaml b/system/kubeapps/values.yaml
index 490ad8a3..9250a20d 100644
--- a/system/kubeapps/values.yaml
+++ b/system/kubeapps/values.yaml
@@ -9,10 +9,6 @@ _helm:
 
 kubeapps:
 
-  #kubeappsapis:
-  #  image: ghcr.io/aenix-io/cozystack/kubeapps-apis:latest
-  dashboard:
-  #  image: ghcr.io/aenix-io/cozystack/dashboard:latest
   postgresql:
     enabled: false
 
@@ -21,3 +17,4 @@ kubeapps:
       enabled: false
     flux:
       enabled: true
+