diff --git a/cloudinfo/.helmignore b/cloudinfo/.helmignore
deleted file mode 100644
index f0c13194444163..00000000000000
--- a/cloudinfo/.helmignore
+++ /dev/null
@@ -1,21 +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
diff --git a/cloudinfo/Chart.yaml b/cloudinfo/Chart.yaml
deleted file mode 100644
index 41f742ed4e9dbb..00000000000000
--- a/cloudinfo/Chart.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: v1
-description: Cloud instance type and price information as a service
-name: cloudinfo
-version: 0.5.0
-
-appVersion: "0.5.0"
-
-home: https://banzaicloud.com
-
-maintainers:
-- name: Banzai Cloud
-  email: info@banzaicloud.com
-
-sources:
-- https://banzaicloud.com
-- https://github.com/banzaicloud
-- https://github.com/banzaicloud/cloudinfo
-
-icon: https://banzaicloud.com/img/banzai-cloud-logo.png
-
diff --git a/cloudinfo/README.md b/cloudinfo/README.md
deleted file mode 100644
index 27123068ed5fbd..00000000000000
--- a/cloudinfo/README.md
+++ /dev/null
@@ -1,89 +0,0 @@
-
-# Cloudinfo Chart
-
-[Cloudinfo](https://github.com/banzaicloud/cloudinfo) Provides resource and pricing information about products available on supported cloud providers - it is a building block of the Hollowtrees project. 
-
-## tl;dr:
-
-```bash
-$ helm repo add banzaicloud-stable http://kubernetes-charts.banzaicloud.com/branch/master
-$ helm repo update
-$ helm install banzaicloud-stable/cloudinfo
-```
-
-## Introduction
-
-This chart bootstraps an [Cloudinfo](https://github.com/banzaicloud/banzai-charts/stable/cloudinfo) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
-
-## Prerequisites
-
-- Kubernetes 1.8+ with Beta APIs enabled
-
-## Installing the Chart
-
-To install the chart with the release name `my-release`:
-
-```bash
-$ helm install --name my-release banzaicloud-stable/cloudinfo
-```
-
-The command deploys **cloudinfo** on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
-
-## 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 tables lists the configurable parameters of the cloudinfo chart and their default values.
-
-|          Parameter            |                Description                               |             Default          |
-| ----------------------------- | -------------------------------------------------------- | ---------------------------- |
-| `image.repository`            | Container image repository                               | `banzaicloud/cloudinfo`    |
-| `image.tag       `            | Container image tag                                      | `latest`                     |
-| `image.pullPolicy`            | Container pull policy                                    | `Always`                     |
-| `service.type`                | The kubernetes service type to use                       | `ClusterIP`                  |
-| `service.name`                | The kubernetes service name to use                       | `cloudinfo`                |
-| `service.port`                | Port to bind to for NodePort service type                | `nil`                        |
-| `service.annotations`         | The kubernetes service annotations                       | `nil`                        |
-| `app.logLevel`                | Log level                                                | `info`                       |
-| `app.basePath`                | Application base path                                    | `/`                          |
-| `auth.awsAccessKeyId`         | Amazon Access Key ID                                     | ""                           |
-| `auth.awsSecretAccessKey`     | Amazon Secret Access Key                                 | ""                           |
-| `auth.gceApiKey`              | GCE API Key                                              | ""                           |
-| `auth.gceCredentials`         | GCE Credential file (encoded by base64)                  | ""                           |
-| `auth.azureSubscriptionId`    | Azure Subscription GUID                                  | ""                           |
-| `auth.azureCredentials`       | Azure Credential file (encoded by base64)                | ""                           |
-| `auth.ociUser`                | The OCID of the user                                     | ""                           |
-| `auth.ociTenancy`             | The OCID of the tenancy                                  | ""                           |
-| `auth.ociRegion`              | Specific region for OCI                                  | ""                           |
-| `auth.ociKey`                 | The key pair must be in PEM format. (encode by base64)   | ""                           |
-| `auth.ociFingerprint`         | Fingerprint for the key pair being used                  | ""                           |
-| `auth.alibabaAccessKeyId`     | Alibaba Access Key ID                                    | ""                           |
-| `auth.alibabaAccessKeySecret` | Alibaba Access Key Secret                                | ""                           |
-| `auth.alibabaRegionId`        | Alibaba Region ID                                        | ""                           |
-| `deploymentLabels`            | Additional deployment labels                             | `{}`                         |
-| `deploymentAnnotations`       | Additional deployment annotations                        | `{}`                         |
-| `metrics.enabled`             | Enable application metrics                               | `true`                       |
-| `metrics.name`                | Metrics service name                                     | `name`                       |
-| `metrics.port`                | Metrics service type port                                | `9900`                       |
-| `metrics.serviceMonitor.enabled` | Enable serviceMonitor                                 | `true`                       |
-| `metrics.serviceMonitor.additionalLabels` | ServiceMonitor additional labels             | `{}`                         |
-
-Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example:
-
-```bash
-$ helm install --name my-release -f values.yaml banzaicloud-stable/cloudinfo
-```
-
-> **Tip**: You can use the default [values.yaml](values.yaml)
-
-
-```
-
diff --git a/cloudinfo/templates/NOTES.txt b/cloudinfo/templates/NOTES.txt
deleted file mode 100644
index 9ae4e105a0888e..00000000000000
--- a/cloudinfo/templates/NOTES.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "cloudinfo.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ template "cloudinfo.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "cloudinfo.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "cloudinfo.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:80
-{{- end }}
diff --git a/cloudinfo/templates/_helpers.tpl b/cloudinfo/templates/_helpers.tpl
deleted file mode 100644
index 52592630baec89..00000000000000
--- a/cloudinfo/templates/_helpers.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "cloudinfo.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 "cloudinfo.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 "cloudinfo.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
diff --git a/cloudinfo/templates/configmap.yaml b/cloudinfo/templates/configmap.yaml
deleted file mode 100644
index 4df697bffaee59..00000000000000
--- a/cloudinfo/templates/configmap.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  labels:
-    app: {{ template "cloudinfo.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: prometheus-config
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "cloudinfo.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
-data:
-  oci.properties: |-
-    [DEFAULT]
-    user={{ .Values.providers.oracle.ociUser }}
-    tenancy={{ .Values.providers.oracle.ociTenancy }}
-    region={{ .Values.providers.oracle.ociRegion }}
-    fingerprint={{ .Values.providers.oracle.ociFingerprint }}
-    key_file=/credentials/oci_key.pem
\ No newline at end of file
diff --git a/cloudinfo/templates/deployment.yaml b/cloudinfo/templates/deployment.yaml
deleted file mode 100644
index 49a3679bf3c6ac..00000000000000
--- a/cloudinfo/templates/deployment.yaml
+++ /dev/null
@@ -1,151 +0,0 @@
-apiVersion: apps/v1beta2
-kind: Deployment
-metadata:
-  name: {{ template "cloudinfo.fullname" . }}
-  labels:
-    app: {{ template "cloudinfo.name" . }}
-    chart: {{ template "cloudinfo.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-    {{- if .Values.deploymentLabels }}
-{{ toYaml .Values.deploymentLabels | indent 4 }}
-    {{- end }}
-  annotations:
-{{ toYaml .Values.deploymentAnnotations | indent 4 }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ template "cloudinfo.name" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ template "cloudinfo.name" . }}
-        release: {{ .Release.Name }}
-    spec:
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          volumeMounts:
-          - name: {{ template "cloudinfo.fullname" . }}-credentials
-            mountPath: /credentials
-            readOnly: true
-          - name: {{ template "cloudinfo.fullname" . }}-oci
-            mountPath: /.oci
-            readOnly: true
-          args:
-            - cloudinfo
-            - --log-level={{ .Values.app.logLevel }}
-            - --listen-address=0.0.0.0:{{ .Values.service.internalPort }}
-            {{- range $key, $value := .Values.providers }}
-            {{- if $value.enabled }}
-            - --provider={{ $key }}
-            {{- end }}
-            {{- end }}
-          env:
-            - name: CLOUDINFO_BASEPATH
-              value: {{ .Values.app.basePath }}
-            - name: GOOGLE_APPLICATION_CREDENTIALS
-              value: /credentials/google.json
-            - name: AZURE_AUTH_LOCATION
-              value: /credentials/azure.json
-            - name: ORACLE_CLI_CONFIG_LOCATION
-              value: /.oci/oci.properties
-            {{ if .Values.providers.amazon.enabled }}
-            - name: AWS_ACCESS_KEY_ID
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "cloudinfo.fullname" . }}
-                  key: awsAccessKeyId
-            - name: AWS_SECRET_ACCESS_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "cloudinfo.fullname" . }}
-                  key: awsSecretAccessKey
-            {{ end }}
-            {{ if .Values.providers.google.enabled }}
-            - name: GCE_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "cloudinfo.fullname" . }}
-                  key: gceApiKey
-            {{ end }}
-            {{ if .Values.providers.azure.enabled }}
-            - name: AZURE_SUBSCRIPTION_ID
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "cloudinfo.fullname" . }}
-                  key: azureSubscriptionId
-            {{ end }}
-            {{ if .Values.providers.alibaba.enabled }}
-            - name: ALIBABA_ACCESS_KEY_ID
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "cloudinfo.fullname" . }}
-                  key: alibabaAccessKeyId
-            - name: ALIBABA_ACCESS_KEY_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "cloudinfo.fullname" . }}
-                  key: alibabaAccessKeySecret
-            - name: ALIBABA_REGION_ID
-              value: {{ .Values.providers.alibaba.alibabaRegionId }}
-            {{ end }}
-            {{ if .Values.metrics.enabled }}
-            - name: METRICS_ENABLED
-              value: "true"
-            - name: METRICS_ADDRESS
-              value: ":{{ .Values.metrics.port }}"
-            {{ end }}
-          ports:
-            - name: http
-              containerPort: {{ .Values.service.internalPort }}
-              protocol: TCP
-            {{- if .Values.metrics.enabled }}
-            - name:  {{ include "cloudinfo.name" . }}-prom
-              containerPort: {{ .Values.metrics.port }}
-            {{- end }}
-          livenessProbe:
-            httpGet:
-              path: {{ .Values.app.basePath }}/status
-              port: http
-          readinessProbe:
-            httpGet:
-              path: {{ .Values.app.basePath }}/status
-              port: http
-          resources:
-{{ toYaml .Values.resources | indent 12 }}
-      volumes:
-        - name: {{ template "cloudinfo.fullname" . }}-credentials
-          secret:
-            secretName: {{ template "cloudinfo.fullname" . }}
-            items:
-            {{ if .Values.providers.google.enabled }}
-            - key: gceCredentials
-              path: google.json
-            {{ end }}
-            {{ if .Values.providers.azure.enabled }}
-            - key: azureCredentials
-              path: azure.json
-            {{ end }}
-            {{ if .Values.providers.oracle.enabled }}
-            - key: ociKey
-              path: oci_key.pem
-            {{ end }}
-        - name: {{ template "cloudinfo.fullname" . }}-oci
-          configMap:
-            name: "{{ template "cloudinfo.fullname" . }}"
-    {{- 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/cloudinfo/templates/ingress.yaml b/cloudinfo/templates/ingress.yaml
deleted file mode 100644
index 7aa657b862a581..00000000000000
--- a/cloudinfo/templates/ingress.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $serviceName := include "cloudinfo.fullname" . -}}
-{{- $servicePort := .Values.service.port -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ template "cloudinfo.fullname" . }}
-  labels:
-    app: {{ template "cloudinfo.name" . }}
-    chart: {{ template "cloudinfo.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-{{- with .Values.ingress.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if .Values.ingress.tls }}
-  tls:
-  {{- range .Values.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.ingress.hosts }}
-  {{- $url := splitList "/" . }}
-    - host: {{ first $url }}
-      http:
-        paths:
-          - path: /{{ rest $url | join "/" }}
-            backend:
-              serviceName: {{ $serviceName }}
-              servicePort: {{ $servicePort }}
-  {{- end}}
-{{- end }}
diff --git a/cloudinfo/templates/secrets.yaml b/cloudinfo/templates/secrets.yaml
deleted file mode 100644
index 3d7bb8c1789c51..00000000000000
--- a/cloudinfo/templates/secrets.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ template "cloudinfo.fullname" . }}
-  labels:
-    app: {{ template "cloudinfo.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-type: Opaque
-data:
-  {{ if .Values.providers.amazon.enabled }}
-  awsAccessKeyId: {{ .Values.providers.amazon.awsAccessKeyId | b64enc | quote }}
-  awsSecretAccessKey: {{ .Values.providers.amazon.awsSecretAccessKey | b64enc | quote }}
-  {{ end }}
-  {{ if .Values.providers.google.enabled }}
-  gceApiKey: {{ .Values.providers.google.gceApiKey | b64enc | quote }}
-  gceCredentials: {{ .Values.providers.google.gceCredentials | quote }}
-  {{ end }}
-  {{ if .Values.providers.azure.enabled }}
-  azureSubscriptionId: {{ .Values.providers.azure.azureSubscriptionId | b64enc | quote }}
-  azureCredentials: {{ .Values.providers.azure.azureCredentials | quote }}
-  {{ end }}
-  {{ if .Values.providers.oracle.enabled }}
-  ociKey: {{ .Values.providers.oracle.ociKey | quote }}
-  {{ end }}
-  {{ if .Values.providers.alibaba.enabled }}
-  alibabaAccessKeyId: {{ .Values.providers.alibaba.alibabaAccessKeyId | b64enc | quote }}
-  alibabaAccessKeySecret: {{ .Values.providers.alibaba.alibabaAccessKeySecret | b64enc | quote }}
-  {{ end }}
\ No newline at end of file
diff --git a/cloudinfo/templates/service-metrics.yaml b/cloudinfo/templates/service-metrics.yaml
deleted file mode 100644
index 4fc410b4e75a35..00000000000000
--- a/cloudinfo/templates/service-metrics.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "cloudinfo.fullname" . }}-metrics
-  labels:
-    app: {{ template "cloudinfo.name" . }}
-    chart: {{ template "cloudinfo.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - name: {{ template "cloudinfo.name" . }}-prom
-      port: {{ .Values.metrics.port }}
-      targetPort: {{ .Values.metrics.port }}
-      protocol: TCP
-  selector:
-    app: {{ template "cloudinfo.name" . }}
-    release: {{ .Release.Name }}
-{{ end }}
diff --git a/cloudinfo/templates/service-monitor-price.yaml b/cloudinfo/templates/service-monitor-price.yaml
deleted file mode 100644
index d08a1906302737..00000000000000
--- a/cloudinfo/templates/service-monitor-price.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name:  {{ template "cloudinfo.fullname" . }}-price
-  labels:
-    app: {{ template "cloudinfo.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-    {{- if .Values.metrics.serviceMonitor.additionalLabels }}
-{{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }}
-    {{- end }}
-spec:
-  endpoints:
-  - interval: 300s
-    port: {{ include "cloudinfo.name" . }}-prom
-    path: /metrics/price
-  jobLabel: {{ include "cloudinfo.name" . }}-price
-  namespaceSelector:
-    matchNames:
-    - "{{ $.Release.Namespace }}"
-  selector:
-    matchLabels:
-      app: {{ include "cloudinfo.name" . }}
-      release: {{ .Release.Name }}
-{{ end }}
diff --git a/cloudinfo/templates/service-monitor-spotprice.yaml b/cloudinfo/templates/service-monitor-spotprice.yaml
deleted file mode 100644
index 59dec0065e713e..00000000000000
--- a/cloudinfo/templates/service-monitor-spotprice.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name:  {{ template "cloudinfo.fullname" . }}-spotprice
-  labels:
-    app: {{ template "cloudinfo.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-    {{- if .Values.metrics.serviceMonitor.additionalLabels }}
-{{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }}
-    {{- end }}
-spec:
-  endpoints:
-  - interval: 300s
-    port: {{ include "cloudinfo.name" . }}-prom
-    path: /metrics/spotprice
-  jobLabel: {{ include "cloudinfo.name" . }}-spotprice
-  namespaceSelector:
-    matchNames:
-    - "{{ $.Release.Namespace }}"
-  selector:
-    matchLabels:
-      app: {{ include "cloudinfo.name" . }}
-      release: {{ .Release.Name }}
-{{ end }}
diff --git a/cloudinfo/templates/service-monitor.yaml b/cloudinfo/templates/service-monitor.yaml
deleted file mode 100644
index 9c44db65b219c9..00000000000000
--- a/cloudinfo/templates/service-monitor.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name:  {{ template "cloudinfo.fullname" . }}
-  labels:
-    app: {{ template "cloudinfo.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-    {{- if .Values.metrics.serviceMonitor.additionalLabels }}
-{{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }}
-    {{- end }}
-spec:
-  endpoints:
-  - interval: 30s
-    port: {{ include "cloudinfo.name" . }}-prom
-    path: /metrics
-  jobLabel: {{ include "cloudinfo.name" . }}
-  namespaceSelector:
-    matchNames:
-    - "{{ $.Release.Namespace }}"
-  selector:
-    matchLabels:
-      app: {{ include "cloudinfo.name" . }}
-      release: {{ .Release.Name }}
-{{ end }}
diff --git a/cloudinfo/templates/service.yaml b/cloudinfo/templates/service.yaml
deleted file mode 100644
index 848bbc81627d86..00000000000000
--- a/cloudinfo/templates/service.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "cloudinfo.fullname" . }}
-  labels:
-    app: {{ template "cloudinfo.name" . }}
-    chart: {{ template "cloudinfo.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - name: {{ template "cloudinfo.fullname" . }}
-      port: {{ .Values.service.port }}
-      targetPort: {{ .Values.service.internalPort }}
-      protocol: TCP
-  selector:
-    app: {{ template "cloudinfo.name" . }}
-    release: {{ .Release.Name }}
\ No newline at end of file
diff --git a/cloudinfo/values.yaml b/cloudinfo/values.yaml
deleted file mode 100644
index 766badf445f7ee..00000000000000
--- a/cloudinfo/values.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-# Default values for cloudinfo.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  repository: banzaicloud/cloudinfo
-  tag: 0.5.0
-  pullPolicy: IfNotPresent
-
-service:
-  type: ClusterIP
-  port: 80
-  internalPort: 8080
-
-ingress:
-  enabled: false
-  annotations: {}
-    #kubernetes.io/ingress.class: traefik
-    #ingress.kubernetes.io/ssl-redirect: "false"
-    #traefik.frontend.rule.type: PathPrefix
-  hosts:
-    - "/"
-    # - "domain.com/xyz"
-    # - "domain.com"
-  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: {}
-
-app:
-  logLevel: "info"
-  basePath: ""
-
-providers:
-  google:
-    enabled: false
-    gceApiKey: ""
-    gceCredentials: ""
-  amazon:
-    enabled: false
-    awsAccessKeyId: ""
-    awsSecretAccessKey: ""
-  azure:
-    enabled: false
-    azureSubscriptionId: ""
-    azureCredentials: ""
-  oracle:
-    enabled: false
-    ociUser: ""
-    ociTenancy: ""
-    ociRegion: ""
-    ociFingerprint: ""
-    ociKey: ""
-  alibaba:
-    enabled: false
-    alibabaAccessKeyId: ""
-    alibabaAccessKeySecret: ""
-    alibabaRegionId: "eu-central-1"
-
-
-## Additional deployment labels and annotations
-## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
-deploymentLabels: {}
-deploymentAnnotations: {}
-
-metrics:
-  enabled: true
-  name: metrics
-  port: 9900
-  serviceMonitor:
-    enabled: false
-    additionalLabels: {}