diff --git a/charts/icantbelieveitsnotvaletudo/.helmignore b/charts/icantbelieveitsnotvaletudo/.helmignore
index 0e8a0eb3..4379e2b3 100644
--- a/charts/icantbelieveitsnotvaletudo/.helmignore
+++ b/charts/icantbelieveitsnotvaletudo/.helmignore
@@ -14,10 +14,13 @@
 *.swp
 *.bak
 *.tmp
-*.orig
 *~
 # Various IDEs
 .project
 .idea/
 *.tmproj
 .vscode/
+# OWNERS file for Kubernetes
+OWNERS
+# helm-docs templates
+*.gotmpl
diff --git a/charts/icantbelieveitsnotvaletudo/Chart.yaml b/charts/icantbelieveitsnotvaletudo/Chart.yaml
index 5a710ba6..97beee1d 100644
--- a/charts/icantbelieveitsnotvaletudo/Chart.yaml
+++ b/charts/icantbelieveitsnotvaletudo/Chart.yaml
@@ -1,16 +1,23 @@
 apiVersion: v2
-appVersion: 0.3.0
-version: 1.0.0
-name: icantbelieveitsnotvaletudo
+appVersion: 2021.2.0
 description: Create live map data from Valetudo powered robots
-type: application
+name: icantbelieveitsnotvaletudo
+version: 2.0.0
+kubeVersion: ">=1.16.0-0"
 keywords:
-  - MQTT
-  - valetudo
-  - iot
-home: https://valetudo.cloud
+- icantbelieveitsnotvaletudo
+- MQTT
+- valetudo
+- iot
+home: https://github.com/k8s-at-home/charts/tree/master/charts/icantbelieveitsnotvaletudo
+icon: https://icantbelieveitsnotvaletudo.org/icon
 sources:
-  - https://github.com/Hypfer/ICantBelieveItsNotValetudo
+- https://github.com/Hypfer/ICantBelieveItsNotValetudo
+- https://github.com/k8s-at-home/charts/tree/master/charts/icantbelieveitsnotvaletudo
 maintainers:
-  - name: ishioni
-    email: helm@movishell.pl
+- name: ishioni
+  email: helm@movishell.pl
+dependencies:
+- name: common
+  repository: https://k8s-at-home.com/charts/
+  version: 3.0.1
diff --git a/charts/icantbelieveitsnotvaletudo/OWNERS b/charts/icantbelieveitsnotvaletudo/OWNERS
new file mode 100644
index 00000000..1ce35762
--- /dev/null
+++ b/charts/icantbelieveitsnotvaletudo/OWNERS
@@ -0,0 +1,8 @@
+approvers:
+- billimek
+- onedr0p
+- bjw-s
+reviewers:
+- billimek
+- onedr0p
+- bjw-s
diff --git a/charts/icantbelieveitsnotvaletudo/README.md b/charts/icantbelieveitsnotvaletudo/README.md
index 416f7599..be73a16c 100644
--- a/charts/icantbelieveitsnotvaletudo/README.md
+++ b/charts/icantbelieveitsnotvaletudo/README.md
@@ -1,30 +1,85 @@
 # icantbelieveitsnotvaletudo
 
-![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.0](https://img.shields.io/badge/AppVersion-0.3.0-informational?style=flat-square)
+![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![AppVersion: 2021.2.0](https://img.shields.io/badge/AppVersion-2021.2.0-informational?style=flat-square)
 
 Create live map data from Valetudo powered robots
 
-**Homepage:** <https://valetudo.cloud>
-
-## Maintainers
-
-| Name | Email | Url |
-| ---- | ------ | --- |
-| ishioni | helm@movishell.pl |  |
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/k8s-at-home/charts/issues/new/choose)**
 
 ## Source Code
 
 * <https://github.com/Hypfer/ICantBelieveItsNotValetudo>
+* <https://github.com/k8s-at-home/charts/tree/master/charts/icantbelieveitsnotvaletudo>
+
+## Requirements
+
+Kubernetes: `>=1.16.0-0`
+
+## Dependencies
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://k8s-at-home.com/charts/ | common | 3.0.1 |
+
+## TL;DR
+
+```console
+helm repo add k8s-at-home https://k8s-at-home.com/charts/
+helm repo update
+helm install icantbelieveitsnotvaletudo k8s-at-home/icantbelieveitsnotvaletudo
+```
+
+## Installing the Chart
+
+To install the chart with the release name `icantbelieveitsnotvaletudo`
+
+```console
+helm install icantbelieveitsnotvaletudo k8s-at-home/icantbelieveitsnotvaletudo
+```
+
+## Uninstalling the Chart
+
+To uninstall the `icantbelieveitsnotvaletudo` deployment
+
+```console
+helm uninstall icantbelieveitsnotvaletudo
+```
+
+The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release.
+
+## Configuration
+
+Read through the [values.yaml](./values.yaml) file. It has several commented out suggested values.
+Other values may be used from the [values.yaml](../common/values.yaml) from the [common library](../common).
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+```console
+helm install icantbelieveitsnotvaletudo \
+  --set env.TZ="America/New York" \
+    k8s-at-home/icantbelieveitsnotvaletudo
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+
+```console
+helm install icantbelieveitsnotvaletudo k8s-at-home/icantbelieveitsnotvaletudo -f values.yaml
+```
+
+## Custom configuration
+
+N/A
 
 ## Values
 
+**Important**: When deploying an application Helm chart you can add more values from our common library chart [here](https://github.com/k8s-at-home/charts/tree/master/charts/common/)
+
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| affinity | object | `{}` |  |
 | config.mapsettings.drawCharger | bool | `true` |  |
 | config.mapsettings.drawPath | bool | `true` |  |
 | config.mapsettings.drawRobot | bool | `true` |  |
-| config.mapsettings.scale | int | `4` |  |
+| config.mapsettings.scale | int | `2` |  |
 | config.mqtt.autoconfPrefix | string | `"homeassistant"` |  |
 | config.mqtt.broker_url | string | `"mqtt://user:pass@example.com:port"` |  |
 | config.mqtt.identifier | string | `"rockrobo"` |  |
@@ -32,31 +87,49 @@ Create live map data from Valetudo powered robots
 | config.mqtt.minMillisecondsBetweenMapUpdates | int | `10000` |  |
 | config.mqtt.publishMapImage | bool | `true` |  |
 | config.mqtt.topicPrefix | string | `"valetudo"` |  |
-| config.webserver.enabled | bool | `false` |  |
-| config.webserver.port | int | `3000` |  |
-| fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"pmaksymiuk/icantbelieveitsnotvaletudo"` |  |
-| image.tag | string | `nil` |  |
-| imagePullSecrets | list | `[]` |  |
-| ingress.annotations | object | `{}` |  |
-| ingress.enabled | bool | `false` |  |
-| ingress.hosts[0].host | string | `"chart-example.local"` |  |
-| ingress.hosts[0].paths | list | `[]` |  |
-| ingress.tls | list | `[]` |  |
-| nameOverride | string | `""` |  |
-| nodeSelector | object | `{}` |  |
-| podAnnotations | object | `{}` |  |
-| podSecurityContext | object | `{}` |  |
-| replicaCount | int | `1` |  |
-| resources | object | `{}` |  |
-| securityContext | object | `{}` |  |
-| service.port | int | `80` |  |
-| service.type | string | `"ClusterIP"` |  |
-| serviceAccount.annotations | object | `{}` |  |
-| serviceAccount.create | bool | `true` |  |
-| serviceAccount.name | string | `""` |  |
-| tolerations | list | `[]` |  |
+| image.tag | string | `"2021.2.0"` |  |
+| probes.liveness.enabled | bool | `false` |  |
+| probes.readiness.enabled | bool | `false` |  |
+| probes.startup.enabled | bool | `false` |  |
+| service.enabled | bool | `false` |  |
+| strategy.type | string | `"RollingUpdate"` |  |
+
+## Changelog
+
+All notable changes to this application Helm chart will be documented in this file but does not include changes from our common library. To read those click [here](https://github.com/k8s-at-home/charts/tree/master/charts/common/README.md#Changelog).
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+### [2.0.0]
+
+#### Added
+
+- N/A
+
+#### Changed
+
+- Ported to common
+- Update from upstream
+- Changed default scale
+
+#### Removed
+
+- Service and Ingress as it's no longer used
+
+### [1.0.0]
+
+#### Added
+
+- Initial commit
+
+## Support
+
+- See the [Wiki](https://github.com/k8s-at-home/charts/wiki)
+- Open a [issue](https://github.com/k8s-at-home/charts/issues/new/choose)
+- Ask a [question](https://github.com/k8s-at-home/charts/discussions)
+- Join our [Discord](https://discord.gg/sTMX7Vh) community
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
+Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
\ No newline at end of file
diff --git a/charts/icantbelieveitsnotvaletudo/README.md.gotmpl b/charts/icantbelieveitsnotvaletudo/README.md.gotmpl
new file mode 100644
index 00000000..387904a6
--- /dev/null
+++ b/charts/icantbelieveitsnotvaletudo/README.md.gotmpl
@@ -0,0 +1,145 @@
+{{- define "custom.repository.organization" -}}
+k8s-at-home
+{{- end -}}
+
+{{- define "custom.repository.url" -}}
+https://github.com/k8s-at-home/charts
+{{- end -}}
+
+{{- define "custom.helm.url" -}}
+https://k8s-at-home.com/charts/
+{{- end -}}
+
+{{- define "custom.helm.path" -}}
+{{ template "custom.repository.organization" . }}/{{ template "chart.name" . }}
+{{- end -}}
+
+{{- define "custom.notes" -}}
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/k8s-at-home/charts/issues/new/choose)**
+{{- end -}}
+
+{{- define "custom.requirements" -}}
+## Requirements
+
+{{ template "chart.kubeVersionLine" . }}
+{{- end -}}
+
+{{- define "custom.dependencies" -}}
+## Dependencies
+
+{{ template "chart.requirementsTable" . }}
+{{- end -}}
+
+{{- define "custom.install.tldr" -}}
+## TL;DR
+
+```console
+helm repo add {{ template "custom.repository.organization" . }} {{ template "custom.helm.url" . }}
+helm repo update
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.install" -}}
+## Installing the Chart
+
+To install the chart with the release name `{{ template "chart.name" . }}`
+
+```console
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.uninstall" -}}
+## Uninstalling the Chart
+
+To uninstall the `{{ template "chart.name" . }}` deployment
+
+```console
+helm uninstall {{ template "chart.name" . }}
+```
+
+The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release.
+{{- end -}}
+
+{{- define "custom.configuration.header" -}}
+## Configuration
+{{- end -}}
+
+{{- define "custom.configuration.readValues" -}}
+Read through the [values.yaml](./values.yaml) file. It has several commented out suggested values.
+Other values may be used from the [values.yaml](../common/values.yaml) from the [common library](../common).
+{{- end -}}
+
+{{- define "custom.configuration.example.set" -}}
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+```console
+helm install {{ template "chart.name" . }} \
+  --set env.TZ="America/New York" \
+    {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.configuration.example.file" -}}
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+
+```console
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }} -f values.yaml
+```
+{{- end -}}
+
+{{- define "custom.valuesSection" -}}
+## Values
+
+**Important**: When deploying an application Helm chart you can add more values from our common library chart [here](https://github.com/k8s-at-home/charts/tree/master/charts/common/)
+
+{{ template "chart.valuesTable" . }}
+{{- end -}}
+
+{{- define "custom.support" -}}
+## Support
+
+- See the [Wiki](https://github.com/k8s-at-home/charts/wiki)
+- Open a [issue](https://github.com/k8s-at-home/charts/issues/new/choose)
+- Ask a [question](https://github.com/k8s-at-home/charts/discussions)
+- Join our [Discord](https://discord.gg/sTMX7Vh) community
+{{- end -}}
+
+{{ template "chart.header" . }}
+
+{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "custom.notes" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "custom.requirements" . }}
+
+{{ template "custom.dependencies" . }}
+
+{{ template "custom.install.tldr" . }}
+
+{{ template "custom.install" . }}
+
+{{ template "custom.uninstall" . }}
+
+{{ template "custom.configuration.header" . }}
+
+{{ template "custom.configuration.readValues" . }}
+
+{{ template "custom.configuration.example.set" . }}
+
+{{ template "custom.configuration.example.file" . }}
+
+{{ template "custom.custom.configuration" . }}
+
+{{ template "custom.valuesSection" . }}
+
+{{ template "custom.changelog" . }}
+
+{{ template "custom.support" . }}
+
+{{ template "helm-docs.versionFooter" . }}
diff --git a/charts/icantbelieveitsnotvaletudo/README_CHANGELOG.md.gotmpl b/charts/icantbelieveitsnotvaletudo/README_CHANGELOG.md.gotmpl
new file mode 100644
index 00000000..4e88d4e1
--- /dev/null
+++ b/charts/icantbelieveitsnotvaletudo/README_CHANGELOG.md.gotmpl
@@ -0,0 +1,33 @@
+{{- define "custom.changelog.header" -}}
+## Changelog
+{{- end -}}
+
+{{- define "custom.changelog" -}}
+{{ template "custom.changelog.header" . }}
+
+All notable changes to this application Helm chart will be documented in this file but does not include changes from our common library. To read those click [here](https://github.com/k8s-at-home/charts/tree/master/charts/common/README.md#Changelog).
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+### [2.0.0]
+
+#### Added
+
+- N/A
+
+#### Changed
+
+- Ported to common
+- Update from upstream
+- Changed default scale
+
+#### Removed
+
+- Service and Ingress as it's no longer used
+
+### [1.0.0]
+
+#### Added
+
+- Initial commit
+{{- end -}}
diff --git a/charts/icantbelieveitsnotvaletudo/README_CONFIG.md.gotmpl b/charts/icantbelieveitsnotvaletudo/README_CONFIG.md.gotmpl
new file mode 100644
index 00000000..e93d80bf
--- /dev/null
+++ b/charts/icantbelieveitsnotvaletudo/README_CONFIG.md.gotmpl
@@ -0,0 +1,9 @@
+{{- define "custom.custom.configuration.header" -}}
+## Custom configuration
+{{- end -}}
+
+{{- define "custom.custom.configuration" -}}
+{{ template "custom.custom.configuration.header" . }}
+
+N/A
+{{- end -}}
diff --git a/charts/icantbelieveitsnotvaletudo/templates/NOTES.txt b/charts/icantbelieveitsnotvaletudo/templates/NOTES.txt
index c952ae25..90f7b653 100644
--- a/charts/icantbelieveitsnotvaletudo/templates/NOTES.txt
+++ b/charts/icantbelieveitsnotvaletudo/templates/NOTES.txt
@@ -1,6 +1 @@
-{{- if .Values.ingress.enabled }}
-You can get the map data under this URL:
-{{- range .Values.ingress.hosts }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}api/map/image
-{{- end }}
-{{- end }}
+{{- include "common.notes.defaultNotes" . -}}
diff --git a/charts/icantbelieveitsnotvaletudo/templates/_helpers.tpl b/charts/icantbelieveitsnotvaletudo/templates/_helpers.tpl
deleted file mode 100644
index 3aa92bde..00000000
--- a/charts/icantbelieveitsnotvaletudo/templates/_helpers.tpl
+++ /dev/null
@@ -1,63 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "icantbelieveitsnotvaletudo.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "icantbelieveitsnotvaletudo.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "icantbelieveitsnotvaletudo.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "icantbelieveitsnotvaletudo.labels" -}}
-helm.sh/chart: {{ include "icantbelieveitsnotvaletudo.chart" . }}
-{{ include "icantbelieveitsnotvaletudo.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "icantbelieveitsnotvaletudo.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "icantbelieveitsnotvaletudo.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "icantbelieveitsnotvaletudo.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "icantbelieveitsnotvaletudo.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
diff --git a/charts/icantbelieveitsnotvaletudo/templates/common.yaml b/charts/icantbelieveitsnotvaletudo/templates/common.yaml
new file mode 100644
index 00000000..33db36c7
--- /dev/null
+++ b/charts/icantbelieveitsnotvaletudo/templates/common.yaml
@@ -0,0 +1,30 @@
+{{- include "common.values.setup" . }}
+
+{{/* Append the configMap to the additionalVolumes */}}
+{{- define "icantbelieveitsnotvaletudo.configmap.volume" -}}
+name: settings
+configMap:
+  name: {{ template "common.names.fullname" . }}
+{{- end -}}
+
+{{- $volume := include "icantbelieveitsnotvaletudo.configmap.volume" . | fromYaml -}}
+{{- if $volume -}}
+    {{- $additionalVolumes := append .Values.additionalVolumes $volume }}
+    {{- $_ := set .Values "additionalVolumes" (deepCopy $additionalVolumes) -}}
+{{- end -}}
+
+{{/* Append the configMap volume to the additionalVolumeMounts */}}
+{{- define "icantbelieveitsnotvaletudo.configmap.volumeMount" -}}
+name: settings
+mountPath: /app/config.json
+subPath: config.json
+{{- end -}}
+
+{{- $volumeMount := include "icantbelieveitsnotvaletudo.configmap.volumeMount" . | fromYaml -}}
+{{- if $volumeMount -}}
+    {{- $additionalVolumeMounts := append .Values.additionalVolumeMounts $volumeMount }}
+    {{- $_ := set .Values "additionalVolumeMounts" (deepCopy $additionalVolumeMounts) -}}
+{{- end -}}
+
+{{/* Render the templates */}}
+{{ include "common.all" . }}
diff --git a/charts/icantbelieveitsnotvaletudo/templates/configmap.yaml b/charts/icantbelieveitsnotvaletudo/templates/configmap.yaml
index a29d9f6a..ccc758b3 100644
--- a/charts/icantbelieveitsnotvaletudo/templates/configmap.yaml
+++ b/charts/icantbelieveitsnotvaletudo/templates/configmap.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "icantbelieveitsnotvaletudo.fullname" . }}
+  name: {{ template "common.names.fullname" . }}
   labels:
-{{ include "icantbelieveitsnotvaletudo.labels" . | indent 4 }}
+    {{- include "common.labels" . | nindent 4 }}
 data:
   config.json: |
     {{- .Values.config | mustToPrettyJson | nindent 4 }}
diff --git a/charts/icantbelieveitsnotvaletudo/templates/deployment.yaml b/charts/icantbelieveitsnotvaletudo/templates/deployment.yaml
deleted file mode 100644
index 0bde9b84..00000000
--- a/charts/icantbelieveitsnotvaletudo/templates/deployment.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "icantbelieveitsnotvaletudo.fullname" . }}
-  labels:
-    {{- include "icantbelieveitsnotvaletudo.labels" . | nindent 4 }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      {{- include "icantbelieveitsnotvaletudo.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-    {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-      labels:
-        {{- include "icantbelieveitsnotvaletudo.selectorLabels" . | nindent 8 }}
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "icantbelieveitsnotvaletudo.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      containers:
-      - name: {{ .Chart.Name }}
-        securityContext:
-          {{- toYaml .Values.securityContext | nindent 12 }}
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.config.webserver.enabled }}
-        ports:
-        - name: http
-          containerPort: {{ .Values.config.webserver.port }}
-          protocol: TCP
-        {{- end }}
-        resources:
-          {{- toYaml .Values.resources | nindent 12 }}
-        volumeMounts:
-        - name: config
-          mountPath: /app/config.json
-          subPath: config.json
-      volumes:
-      - name: config
-        configMap:
-          name: {{ include "icantbelieveitsnotvaletudo.fullname" . }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
diff --git a/charts/icantbelieveitsnotvaletudo/templates/ingress.yaml b/charts/icantbelieveitsnotvaletudo/templates/ingress.yaml
deleted file mode 100644
index fa443ead..00000000
--- a/charts/icantbelieveitsnotvaletudo/templates/ingress.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "icantbelieveitsnotvaletudo.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "icantbelieveitsnotvaletudo.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.ingress.tls }}
-  tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-  rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ . }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-          {{- end }}
-    {{- end }}
-  {{- end }}
diff --git a/charts/icantbelieveitsnotvaletudo/templates/service.yaml b/charts/icantbelieveitsnotvaletudo/templates/service.yaml
deleted file mode 100644
index 53ea08da..00000000
--- a/charts/icantbelieveitsnotvaletudo/templates/service.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-{{- if .Values.ingress.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "icantbelieveitsnotvaletudo.fullname" . }}
-  labels:
-    {{- include "icantbelieveitsnotvaletudo.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    {{- include "icantbelieveitsnotvaletudo.selectorLabels" . | nindent 4 }}
-{{- end }}
diff --git a/charts/icantbelieveitsnotvaletudo/templates/serviceaccount.yaml b/charts/icantbelieveitsnotvaletudo/templates/serviceaccount.yaml
deleted file mode 100644
index cc4db4b9..00000000
--- a/charts/icantbelieveitsnotvaletudo/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "icantbelieveitsnotvaletudo.serviceAccountName" . }}
-  labels:
-    {{- include "icantbelieveitsnotvaletudo.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/charts/icantbelieveitsnotvaletudo/values.yaml b/charts/icantbelieveitsnotvaletudo/values.yaml
index 097318a6..3bd20ca2 100644
--- a/charts/icantbelieveitsnotvaletudo/values.yaml
+++ b/charts/icantbelieveitsnotvaletudo/values.yaml
@@ -1,25 +1,24 @@
-# Default values for valetudo-mapper.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
+#
+# IMPORTANT NOTE
+#
+# This chart inherits from our common library chart. You can check the default values/options here:
+# https://github.com/k8s-at-home/charts/tree/master/charts/common/values.yaml
+#
 
 image:
   repository: pmaksymiuk/icantbelieveitsnotvaletudo
   pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
-  tag:
+  tag: 2021.2.0
 
-imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: ""
+strategy:
+  type: RollingUpdate
 
 config:
   mapsettings:
     drawPath: true
     drawCharger: true
     drawRobot: true
-    scale: 4
+    scale: 2
   mqtt:
     identifier: "rockrobo"
     topicPrefix: "valetudo"
@@ -28,63 +27,14 @@ config:
     mapDataTopic: "valetudo/rockrobo/map_data"
     minMillisecondsBetweenMapUpdates: 10000
     publishMapImage: true
-  webserver:
-    enabled: false
-    port: 3000
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
-podAnnotations: {}
-
-podSecurityContext: {}
-  # fsGroup: 2000
-
-securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
 
 service:
-  type: ClusterIP
-  port: 80
-
-ingress:
   enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  hosts:
-    - host: chart-example.local
-      paths: []
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
 
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
+probes:
+  liveness:
+    enabled: false
+  readiness:
+    enabled: false
+  startup:
+    enabled: false