diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 190ace85..54818501 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -29,7 +29,7 @@ jobs:
 
       - name: Check helm docs did not change anything
         run: |
-          CHANGES=$(git diff --stat charts :^charts/kafka-manager)
+          CHANGES=$(git diff --stat charts)
           if [ -n "${CHANGES}" ]; then
             printf "README is not up to date with helm-docs. Following mismatches are detected:\n$CHANGES\n"
             exit 1
diff --git a/charts/kafka-manager/.helmignore b/charts/kafka-manager/.helmignore
deleted file mode 100644
index 7c04072e..00000000
--- a/charts/kafka-manager/.helmignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-OWNERS
diff --git a/charts/kafka-manager/Chart.yaml b/charts/kafka-manager/Chart.yaml
deleted file mode 100644
index a6935364..00000000
--- a/charts/kafka-manager/Chart.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: v2
-name: kafka-manager
-version: 2.3.1
-appVersion: 1.3.3.18
-kubeVersion: "^1.8.0-0"
-description: A tool for managing Apache Kafka.
-home: https://github.com/yahoo/kafka-manager
-icon: https://kafka.apache.org/images/logo.png
-sources:
-  - https://github.com/yahoo/kafka-manager
-keywords:
-- kafka
-- zookeeper
-- kafka-manager
-maintainers:
-- name: giacomoguiulfo
-  email: giacomoguiulfo@gmail.com
-- name: ssalaues
-  email: salim.salaues@scality.com
-engine: gotpl
diff --git a/charts/kafka-manager/DOCS.md.gotmpl b/charts/kafka-manager/DOCS.md.gotmpl
deleted file mode 100644
index e69de29b..00000000
diff --git a/charts/kafka-manager/OWNERS b/charts/kafka-manager/OWNERS
deleted file mode 100644
index b1df4d88..00000000
--- a/charts/kafka-manager/OWNERS
+++ /dev/null
@@ -1,6 +0,0 @@
-approvers:
-- giacomoguiulfo
-- ssalaues
-reviewers:
-- giacomoguiulfo
-- ssalaues
diff --git a/charts/kafka-manager/README.md b/charts/kafka-manager/README.md
deleted file mode 100644
index e0028b60..00000000
--- a/charts/kafka-manager/README.md
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-# Kafka Manager Helm Chart
-
-[Kafka Manager](https://github.com/yahoo/kafka-manager) is a tool for managing [Apache Kafka](http://kafka.apache.org/).
-
-## TL;DR;
-
-```bash
-$ helm install stable/kafka-manager
-```
-
-## Prerequisites
-
-- Kubernetes 1.9+ with Beta APIs enabled
-
-## Installing the Chart
-
-To install the chart with the release name `my-release`:
-
-```bash
-$ helm install --name my-release stable/kafka-manager
-```
-
-The command deploys Kafka Manager on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
-
-> **Tip**: List all releases using `helm list`
-
-## Uninstalling the Chart
-
-To uninstall/delete the `my-release` deployment:
-
-```bash
-$ helm delete my-release
-```
-
-The command removes all the Kubernetes components associated with the chart and deletes the release.
-
-## Configuration
-
-The following table lists the configurable parameters of the Kafka Manager chart and their default values.
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| serviceAccount.create | bool | `true` |  |
-| serviceAccount.name | string | `""` |  |
-| clusters | string | `nil` |  |
-| applicationSecret | string | `""` |  |
-| basicAuth.enabled | bool | `false` |  |
-| basicAuth.username | string | `"admin"` |  |
-| basicAuth.password | string | `""` |  |
-| javaOptions | string | `""` |  |
-| service.type | string | `"ClusterIP"` |  |
-| service.port | int | `9000` |  |
-| service.annotations | object | `{}` |  |
-| resources.requests.cpu | string | `"100m"` |  |
-| resources.requests.memory | string | `"400Mi"` |  |
-| nodeSelector | object | `{}` |  |
-| tolerations | list | `[]` |  |
-| affinity | object | `{}` |  |
-| zookeeper | object | `{"enabled":false,"env":{"ZK_HEAP_SIZE":"1G"},"persistence":{"enabled":false}}` | ---------------------------------------------------------------------------- |
-| zkHosts | string | `"cp-zookeeper:2181"` |  |
-| image.repository | string | `"radarbase/kafka-manager"` |  |
-| image.tag | string | `nil` | Overrides the image tag whose default is the chart appVersion. |
-| image.pullPolicy | string | `"IfNotPresent"` |  |
-| imagePullSecrets | list | `[]` | Docker registry secret names as an array |
-| disable_tls | bool | `false` | Reconfigure Ingress to not force TLS |
-| ingress.enabled | bool | `true` | Enable ingress controller resource |
-| ingress.annotations | object | check values.yaml | Annotations that define default ingress class, certificate issuer |
-| ingress.path | string | `"/kafkamanager/"` | Path within the url structure |
-| ingress.pathType | string | `"ImplementationSpecific"` |  |
-| ingress.hosts | list | `["localhost"]` | Hosts to accept requests from |
-| ingress.tls.secretName | string | `"radar-base-tls"` | TLS Secret Name |
-
-Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
-
-```console
-$ helm install stable/kafka-manager --name my-release \
-    --set ingress.enabled=true
-```
-
-Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
-
-```console
-$ helm install stable/kafka-manager --name my-release -f values.yaml
-```
-
-> **Tip**: You can use the default [values.yaml](values.yaml)
diff --git a/charts/kafka-manager/README.md.gotmpl b/charts/kafka-manager/README.md.gotmpl
deleted file mode 100644
index 611d2665..00000000
--- a/charts/kafka-manager/README.md.gotmpl
+++ /dev/null
@@ -1,56 +0,0 @@
-# Kafka Manager Helm Chart
-
-[Kafka Manager](https://github.com/yahoo/kafka-manager) is a tool for managing [Apache Kafka](http://kafka.apache.org/).
-
-## TL;DR;
-
-```bash
-$ helm install stable/kafka-manager
-```
-
-## Prerequisites
-
-- Kubernetes 1.9+ with Beta APIs enabled
-
-## Installing the Chart
-
-To install the chart with the release name `my-release`:
-
-```bash
-$ helm install --name my-release stable/kafka-manager
-```
-
-The command deploys Kafka Manager on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
-
-> **Tip**: List all releases using `helm list`
-
-## Uninstalling the Chart
-
-To uninstall/delete the `my-release` deployment:
-
-```bash
-$ helm delete my-release
-```
-
-The command removes all the Kubernetes components associated with the chart and deletes the release.
-
-## Configuration
-
-The following table lists the configurable parameters of the Kafka Manager chart and their default values.
-
-{{ template "chart.valuesSection" . }}
-
-Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
-
-```console
-$ helm install stable/kafka-manager --name my-release \
-    --set ingress.enabled=true
-```
-
-Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
-
-```console
-$ helm install stable/kafka-manager --name my-release -f values.yaml
-```
-
-> **Tip**: You can use the default [values.yaml](values.yaml)
diff --git a/charts/kafka-manager/ci/example-values.yaml b/charts/kafka-manager/ci/example-values.yaml
deleted file mode 100644
index 42b22284..00000000
--- a/charts/kafka-manager/ci/example-values.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-zookeeper:
-  enabled: true
diff --git a/charts/kafka-manager/templates/NOTES.txt b/charts/kafka-manager/templates/NOTES.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/charts/kafka-manager/templates/_helpers.tpl b/charts/kafka-manager/templates/_helpers.tpl
deleted file mode 100644
index bd8a32ea..00000000
--- a/charts/kafka-manager/templates/_helpers.tpl
+++ /dev/null
@@ -1,92 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "kafka-manager.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 "kafka-manager.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 "kafka-manager.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "kafka-manager.labels" -}}
-helm.sh/chart: {{ include "kafka-manager.chart" . }}
-{{ include "kafka-manager.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "kafka-manager.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "kafka-manager.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create a default fully qualified bootstrap job name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "kafka-manager.bootstrap.fullname" -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s-bootstrap" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified zookeeper name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "kafka-manager.zookeeper.fullname" -}}
-{{- $name := default "zookeeper" .Values.zookeeper.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use.
-*/}}
-{{- define "kafka-manager.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "kafka-manager.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the kafka-manager zookeeper hosts url.
-*/}}
-{{- define "kafka-manager.zkHosts" -}}
-{{- if .Values.zookeeper.enabled -}}
-    {{- printf "%s:2181" (include "kafka-manager.zookeeper.fullname" .) }}
-{{- else -}}
-    {{- default "localhost:2181" (tpl .Values.zkHosts .) -}}
-{{- end -}}
-{{- end -}}
diff --git a/charts/kafka-manager/templates/configmap.yaml b/charts/kafka-manager/templates/configmap.yaml
deleted file mode 100644
index c9375510..00000000
--- a/charts/kafka-manager/templates/configmap.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-{{- if .Values.clusters -}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "kafka-manager.bootstrap.fullname" . }}
-  labels:
-    {{ include "kafka-manager.labels" . | indent 4 }}
-data:
-  addClusters.sh: |
-    #!/bin/bash
-    set -e
-    {{- range $cluster := .Values.clusters }}
-    {{ printf "curl http://%s:9000/clusters -X POST -f " (include "kafka-manager.fullname" $) -}}
-    {{- printf "-d name=%v " (default "default" $cluster.name) -}}
-    {{- printf "-d zkHosts=%v " (default (include "kafka-manager.zkHosts" $) $cluster.zkHosts) -}}
-    {{- printf "-d kafkaVersion=%v " (default "1.0.0" $cluster.kafkaVersion) -}}
-    {{- printf "-d jmxEnabled=%v " (default "false" $cluster.jmxEnabled) -}}
-    {{- printf "-d jmxUser=%v " (default "" $cluster.jmxUser) -}}
-    {{- printf "-d jmxPass=%v " (default "" $cluster.jmxPass) -}}
-    {{- printf "-d jmxSsl=%v " (default "false" $cluster.jmxSsl) -}}
-    {{- printf "-d logkafkaEnabled=%v " (default "false" $cluster.logkafkaEnabled) -}}
-    {{- printf "-d pollConsumers=%v " (default "false" $cluster.pollConsumers) -}}
-    {{- printf "-d filterConsumers=%v " (default "false" $cluster.filterConsumers) -}}
-    {{- printf "-d activeOffsetCacheEnabled=%v " (default "false" $cluster.activeOffsetCacheEnabled) -}}
-    {{- printf "-d displaySizeEnabled=%v " (default "false" $cluster.displaySizeEnabled) -}}
-    {{- printf "-d tuning.brokerViewUpdatePeriodSeconds=%v " (default "30" $cluster.tuning.brokerViewUpdatePeriodSeconds) -}}
-    {{- printf "-d tuning.clusterManagerThreadPoolSize=%v " (default "2" $cluster.tuning.clusterManagerThreadPoolSize) -}}
-    {{- printf "-d tuning.clusterManagerThreadPoolQueueSize=%v " (default "100" $cluster.tuning.clusterManagerThreadPoolQueueSize) -}}
-    {{- printf "-d tuning.kafkaCommandThreadPoolSize=%v " (default "2" $cluster.tuning.kafkaCommandThreadPoolSize) -}}
-    {{- printf "-d tuning.kafkaCommandThreadPoolQueueSize=%v " (default "100" $cluster.tuning.kafkaCommandThreadPoolQueueSize) -}}
-    {{- printf "-d tuning.logkafkaCommandThreadPoolSize=%v " (default "2" $cluster.tuning.logkafkaCommandThreadPoolSize) -}}
-    {{- printf "-d tuning.logkafkaCommandThreadPoolQueueSize=%v " (default "100" $cluster.tuning.logkafkaCommandThreadPoolQueueSize) -}}
-    {{- printf "-d tuning.logkafkaUpdatePeriodSeconds=%v " (default "30" $cluster.tuning.logkafkaUpdatePeriodSeconds) -}}
-    {{- printf "-d tuning.partitionOffsetCacheTimeoutSecs=%v " (default "5" $cluster.tuning.partitionOffsetCacheTimeoutSecs) -}}
-    {{- printf "-d tuning.brokerViewThreadPoolSize=%v " (default "4" $cluster.tuning.brokerViewThreadPoolSize) -}}
-    {{- printf "-d tuning.brokerViewThreadPoolQueueSize=%v " (default "1000" $cluster.tuning.brokerViewThreadPoolQueueSize) -}}
-    {{- printf "-d tuning.offsetCacheThreadPoolSize=%v " (default "4" $cluster.tuning.offsetCacheThreadPoolSize) -}}
-    {{- printf "-d tuning.offsetCacheThreadPoolQueueSize=%v " (default "1000" $cluster.tuning.offsetCacheThreadPoolQueueSize) -}}
-    {{- printf "-d tuning.kafkaAdminClientThreadPoolSize=%v " (default "4" $cluster.tuning.kafkaAdminClientThreadPoolSize) -}}
-    {{- printf "-d tuning.kafkaAdminClientThreadPoolQueueSize=%v " (default "1000" $cluster.tuning.kafkaAdminClientThreadPoolQueueSize) -}}
-    {{- printf "-d tuning.kafkaManagedOffsetMetadataCheckMillis=%v " (default "30000" $cluster.tuning.kafkaManagedOffsetMetadataCheckMillis) -}}
-    {{- printf "-d tuning.kafkaManagedOffsetGroupCacheSize=%v " (default "1000000" $cluster.tuning.kafkaManagedOffsetGroupCacheSize) -}}
-    {{- printf "-d tuning.kafkaManagedOffsetGroupExpireDays=%v " (default "7" $cluster.tuning.kafkaManagedOffsetGroupExpireDays) -}}
-    {{- printf "-d securityProtocol=%v " (default "PLAINTEXT" $cluster.securityProtocol) -}}
-    {{- printf "$( if $KAFKA_MANAGER_AUTH_ENABLED; then echo -u $KAFKA_MANAGER_USERNAME:$KAFKA_MANAGER_PASSWORD ; fi ) " -}}
-    {{- end -}}
-{{- end -}}
diff --git a/charts/kafka-manager/templates/deployment.yaml b/charts/kafka-manager/templates/deployment.yaml
deleted file mode 100644
index 091c1343..00000000
--- a/charts/kafka-manager/templates/deployment.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ template "kafka-manager.fullname" . }}
-  labels:
-{{ include "kafka-manager.labels" . | indent 4 }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: {{ template "kafka-manager.name" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ template "kafka-manager.name" . }}
-        release: {{ .Release.Name }}
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ template "kafka-manager.serviceAccountName" . }}
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: kafka-manager
-              containerPort: 9000
-              protocol: TCP
-          env:
-            - name: ZK_HOSTS
-              value: {{ include "kafka-manager.zkHosts" . | quote }}
-            - name: JAVA_OPTS
-              value: {{ .Values.javaOptions }}
-            - name: APPLICATION_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "kafka-manager.fullname" . }}
-                  key: applicationSecret
-            - name: KAFKA_MANAGER_AUTH_ENABLED
-              value: {{ .Values.basicAuth.enabled | quote }}
-            - name: KAFKA_MANAGER_USERNAME
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "kafka-manager.fullname" . }}
-                  key: basicAuthUsername
-            - name: KAFKA_MANAGER_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "kafka-manager.fullname" . }}
-                  key: basicAuthPassword
-          livenessProbe:
-            exec:
-              command:
-              - /bin/sh
-              - -c
-              - wget localhost:9000/kafkamanager/api/health 2>&1 | grep -q 401 || exit 1
-          readinessProbe:
-            exec:
-              command:
-              - /bin/sh
-              - -c
-              - wget localhost:9000/kafkamanager/api/health 2>&1 | grep -q 401 || exit 1
-          resources:
-{{ toYaml .Values.resources | indent 12 }}
-    {{- with .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}
diff --git a/charts/kafka-manager/templates/ingress.yaml b/charts/kafka-manager/templates/ingress.yaml
deleted file mode 100644
index db1d8456..00000000
--- a/charts/kafka-manager/templates/ingress.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "kafka-manager.fullname" . -}}
-{{- $path := .Values.ingress.path -}}
-{{- $hosts := .Values.ingress.hosts -}}
-{{- $svcPort := .Values.service.port -}}
-{{- $pathType := .Values.ingress.pathType -}}
-{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-{{ include "kafka-manager.labels" . | indent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-{{- if and .Values.ingress.tls (not .Values.disable_tls) }}
-  tls:
-    - hosts:
-      {{- range $hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .Values.ingress.tls.secretName }}
-{{- end }}
-  rules:
-  {{- range .Values.ingress.hosts }}
-    - host: {{ . | quote }}
-      http:
-        paths:
-          - path: {{ $path | quote }}
-            {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
-            pathType: {{ $pathType }}
-            {{- end }}
-            backend:
-              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $svcPort }}
-              {{- else }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-              {{- end }}
-  {{- end }}
-{{- end }}
diff --git a/charts/kafka-manager/templates/job.yaml b/charts/kafka-manager/templates/job.yaml
deleted file mode 100644
index 7b8c255c..00000000
--- a/charts/kafka-manager/templates/job.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-{{- if .Values.clusters -}}
-{{- $scriptHash := include (print $.Template.BasePath "/configmap.yaml") . | sha256sum | trunc 8 -}}
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: "{{ template "kafka-manager.bootstrap.fullname" . }}-{{ $scriptHash }}"
-  labels:
-{{ include "kafka-manager.labels" . | indent 4 }}
-spec:
-  template:
-    metadata:
-      labels:
-        app: {{ template "kafka-manager.name" . }}
-        release: {{ .Release.Name }}
-    spec:
-      serviceAccountName: {{ template "kafka-manager.serviceAccountName" . }}
-      restartPolicy: OnFailure
-      volumes:
-        - name: script-volume
-          configMap:
-            name: {{ template "kafka-manager.bootstrap.fullname" . }}
-            defaultMode: 0744
-      containers:
-        - name: {{ .Chart.Name }}-bootstrap
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command: ["/usr/local/script/addClusters.sh"]
-          env:
-            - name: KAFKA_MANAGER_AUTH_ENABLED
-              value: {{ .Values.basicAuth.enabled | quote }}
-            - name: KAFKA_MANAGER_USERNAME
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "kafka-manager.fullname" . }}
-                  key: basicAuthUsername
-            - name: KAFKA_MANAGER_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "kafka-manager.fullname" . }}
-                  key: basicAuthPassword
-          volumeMounts:
-            - name: script-volume
-              mountPath: "/usr/local/script"
-  backoffLimit: 20
-{{- end -}}
diff --git a/charts/kafka-manager/templates/secrets.yaml b/charts/kafka-manager/templates/secrets.yaml
deleted file mode 100644
index 9e3d6cf6..00000000
--- a/charts/kafka-manager/templates/secrets.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ template "kafka-manager.fullname" . }}
-  labels:
-{{ include "kafka-manager.labels" . | indent 4 }}
-type: Opaque
-data:
-  {{ if .Values.applicationSecret }}
-  applicationSecret:  {{ .Values.applicationSecret | b64enc | quote }}
-  {{ else }}
-  applicationSecret: {{ randAlphaNum 10 | b64enc | quote }}
-  {{ end }}
-  basicAuthUsername:  {{ .Values.basicAuth.username | b64enc | quote }}
-  {{ if .Values.basicAuth.password }}
-  basicAuthPassword:  {{ .Values.basicAuth.password | b64enc | quote }}
-  {{ else }}
-  basicAuthPassword: {{ randAlphaNum 10 | b64enc | quote }}
-  {{ end }}
diff --git a/charts/kafka-manager/templates/service.yaml b/charts/kafka-manager/templates/service.yaml
deleted file mode 100644
index d7a054ac..00000000
--- a/charts/kafka-manager/templates/service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "kafka-manager.fullname" . }}
-  labels:
-{{ include "kafka-manager.labels" . | indent 4 }}
-{{- with .Values.service.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - name: kafka-manager
-      port: {{ .Values.service.port }}
-      targetPort: kafka-manager
-      protocol: TCP
-  selector:
-    app: {{ template "kafka-manager.name" . }}
-    release: {{ .Release.Name }}
diff --git a/charts/kafka-manager/templates/serviceaccount.yaml b/charts/kafka-manager/templates/serviceaccount.yaml
deleted file mode 100644
index 86c851f2..00000000
--- a/charts/kafka-manager/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-{{- if .Values.serviceAccount.create }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-{{ include "kafka-manager.labels" . | indent 4 }}
-  name: {{ template "kafka-manager.serviceAccountName" . }}
-{{- end }}
diff --git a/charts/kafka-manager/values.yaml b/charts/kafka-manager/values.yaml
deleted file mode 100644
index 5709074d..00000000
--- a/charts/kafka-manager/values.yaml
+++ /dev/null
@@ -1,169 +0,0 @@
-# ------------------------------------------------------------------------------
-# Kafka Manager:
-# ------------------------------------------------------------------------------
-
-## Service account configuration
-## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
-##
-serviceAccount:
-  create: true
-  ## Define serviceAccount name. Defaults to fully qualified name or "default"
-  ## when create is false
-  ##
-  name: ""
-
-## Clusters to be added through the kafka-manager api
-##
-clusters:
-  ## Name of your cluster
-  # - name: "default"
-
-    ## Cluster zookeeper hosts. It will default to the
-    ## Kafka-manager zookeeper hosts if not specified
-    ##
-    # zkHosts: ""
-
-    ## The following parameters can be configured for your cluster.
-    ## See '_helpers.tpl' for the default values
-    ##
-    # kafkaVersion: ""
-    # jmxEnabled: ""
-    # jmxUser: ""
-    # jmxPass: ""
-    # jmxSsl: ""
-    # logkafkaEnabled: ""
-    # pollConsumers: ""
-    # filterConsumers: ""
-    # activeOffsetCacheEnabled: ""
-    # displaySizeEnabled: ""
-    # securityProtocol: ""
-
-    ## Additional cluster tunning. It is mandatory that this value exists,
-    ## even if it's empty '{}'.
-    ##
-    # tuning: {}
-      # brokerViewUpdatePeriodSeconds:
-      # clusterManagerThreadPoolSize:
-      # clusterManagerThreadPoolQueueSize:
-      # kafkaCommandThreadPoolSize:
-      # kafkaCommandThreadPoolQueueSize:
-      # logkafkaCommandThreadPoolSize:
-      # logkafkaCommandThreadPoolQueueSize:
-      # logkafkaUpdatePeriodSeconds:
-      # partitionOffsetCacheTimeoutSecs:
-      # brokerViewThreadPoolSize:
-      # brokerViewThreadPoolQueueSize:
-      # offsetCacheThreadPoolSize:
-      # offsetCacheThreadPoolQueueSize:
-      # kafkaAdminClientThreadPoolSize:
-      # kafkaAdminClientThreadPoolQueueSize:
-      # kafkaManagedOffsetMetadataCheckMillis:
-      # kafkaManagedOffsetGroupCacheSize:
-      # kafkaManagedOffsetGroupExpireDays:
-
-## Application secret. Defaults to a random 10-character alphanumeric string
-##
-applicationSecret: ""
-
-## Basic Auth configuration
-##
-basicAuth:
-  enabled: false
-  username: "admin"
-  ## Defaults to a random 10-character alphanumeric string if not set
-  ##
-  password: ""
-
-## Java runtime options. Passed through the JAVA_OPTS environmental variable
-##
-javaOptions: ""
-
-## Service configuration
-## Ref: http://kubernetes.io/docs/user-guide/services/
-##
-service:
-  type: ClusterIP
-  port: 9000
-  annotations: {}
-
-## Pod resource requests and limits
-## Ref: http://kubernetes.io/docs/user-guide/compute-resources/
-##
-resources:
-#  limits:
-#    cpu: 100m
-#    memory: 128Mi
-  requests:
-    cpu: 100m
-    memory: 400Mi
-
-## Node labels for pod assignment
-## Ref: https://kubernetes.io/docs/user-guide/node-selection/
-##
-nodeSelector: {}
-
-## Tolerations for pod assignment
-## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
-##
-tolerations: []
-
-## Affinity for pod assignment
-## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
-##
-affinity: {}
-
-# ------------------------------------------------------------------------------
-# Zookeeper:
-# ------------------------------------------------------------------------------
-
-zookeeper:
-  enabled: false
-
-  ## Environmental variables to set in Zookeeper
-  ##
-  env:
-    ## The JVM heap size to allocate to Zookeeper
-    ZK_HEAP_SIZE: "1G"
-
-  ## Configure Zookeeper persistence
-  persistence:
-    enabled: false
-
-
-## Kafka-manager zookeeper hosts. Default to localhost:2181 or
-## the bundled zookeeper chart service url if enabled (see below).
-## This value can be a template
-##
-zkHosts: cp-zookeeper:2181
-
-## Specs for the Kafka-manager image
-##
-image:
-  repository: radarbase/kafka-manager
-  # -- Overrides the image tag whose default is the chart appVersion.
-  tag:
-  pullPolicy: IfNotPresent
-
-# -- Docker registry secret names as an array
-imagePullSecrets: []
-
-# -- Reconfigure Ingress to not force TLS
-disable_tls: false
-
-ingress:
-  # -- Enable ingress controller resource
-  enabled: true
-  # -- Annotations that define default ingress class, certificate issuer
-  # @default -- check values.yaml
-  annotations:
-    kubernetes.io/ingress.class: nginx
-    cert-manager.io/cluster-issuer: letsencrypt-prod
-  # -- Path within the url structure
-  path: /kafkamanager/
-  pathType: ImplementationSpecific
-  # -- Hosts to accept requests from
-  hosts:
-    - localhost
-  tls:
-    # -- TLS Secret Name
-    secretName: radar-base-tls