diff --git a/charts/fluent-bit/Chart.yaml b/charts/fluent-bit/Chart.yaml
index 16054392db..ca27d85969 100644
--- a/charts/fluent-bit/Chart.yaml
+++ b/charts/fluent-bit/Chart.yaml
@@ -1,7 +1,6 @@
 apiVersion: v1
-appVersion: v2.0.0
-description: Uses fluent-bit Loki go plugin for gathering logs and sending them to
-  Loki
+appVersion: v2.1.0
+description: Uses fluent-bit Loki go plugin for gathering logs and sending them to Loki
 home: https://grafana.com/loki
 icon: https://raw.githubusercontent.com/grafana/loki/master/docs/sources/logo.png
 kubeVersion: ^1.10.0-0
@@ -11,4 +10,4 @@ maintainers:
 name: fluent-bit
 sources:
 - https://github.com/grafana/loki
-version: 2.0.1
+version: 2.2.0
diff --git a/charts/fluent-bit/README.md b/charts/fluent-bit/README.md
index 8af1a8fe2f..4b221f4200 100644
--- a/charts/fluent-bit/README.md
+++ b/charts/fluent-bit/README.md
@@ -2,14 +2,23 @@
 
 This chart install the Fluent Bit application to ship logs to Loki. It defines daemonset on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
 
+## Get Repo Info
+
+```console
+helm repo add grafana https://grafana.github.io/helm-charts
+helm repo update
+```
+
+_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._
+
 ## Installing the Chart
 
 > If you don't have `Helm` installed locally, or `Tiller` installed in your Kubernetes cluster, read the [Using Helm](https://docs.helm.sh/using_helm/) documentation to get started.
 To install the chart with the release name `my-release` using our helm repository:
 
 ```bash
-helm repo add loki https://grafana.github.io/loki/charts
-helm upgrade --install my-release loki/fluent-bit \
+helm repo add grafana https://grafana.github.io/helm-charts
+helm upgrade --install my-release grafana/fluent-bit \
     --set loki.serviceName=loki.default.svc.cluster.local
 ```
 
@@ -20,7 +29,7 @@ The command deploys Fluent Bit on the Kubernetes cluster with the default config
 To configure the chart to send to [Grafana Cloud](https://grafana.com/products/cloud) use:
 
 ```bash
-helm upgrade --install my-release loki/fluent-bit \
+helm upgrade --install my-release grafana/fluent-bit \
     --set loki.serviceName=logs-us-west1.grafana.net,loki.servicePort=80,loki.serviceScheme=https \
     --set loki.user=2830,loki.password=1234
 ```
@@ -30,7 +39,7 @@ helm upgrade --install my-release loki/fluent-bit \
 To install a custom tag use the following command:
 
 ```bash
-helm upgrade --install my-release loki/fluent-bit \
+helm upgrade --install my-release grafana/fluent-bit \
     --set image.tag=<custom tag>
 ```
 
@@ -39,7 +48,7 @@ The full list of available tags on [docker hub](https://cloud.docker.com/u/grafa
 Alternatively you can install the full [Loki stack](../loki-stack) (Loki + Fluent Bit) using:
 
 ```bash
-helm upgrade --install my-release loki/loki-stack \
+helm upgrade --install my-release grafana/loki-stack \
     --set fluent-bit.enabled=true,promtail.enabled=false
 ```
 
diff --git a/charts/fluent-bit/templates/configmap.yaml b/charts/fluent-bit/templates/configmap.yaml
index 23fdba80e6..bb09b2458e 100644
--- a/charts/fluent-bit/templates/configmap.yaml
+++ b/charts/fluent-bit/templates/configmap.yaml
@@ -33,7 +33,7 @@ data:
         K8S-Logging.Exclude {{ .Values.config.k8sLoggingExclude }}
         K8S-Logging.Parser {{ .Values.config.k8sLoggingParser }}
     [Output]
-        Name loki
+        Name grafana-loki
         Match *
         {{- if and .Values.loki.user .Values.loki.password }}
         Url {{ .Values.loki.serviceScheme }}://{{ .Values.loki.user }}:{{ .Values.loki.password }}@{{ include "loki.serviceName" . }}:{{ .Values.loki.servicePort }}{{ .Values.loki.servicePath }}
diff --git a/charts/fluent-bit/values.yaml b/charts/fluent-bit/values.yaml
index 4c7e8bc9fb..ab267555bd 100644
--- a/charts/fluent-bit/values.yaml
+++ b/charts/fluent-bit/values.yaml
@@ -50,7 +50,7 @@ deploymentStrategy: RollingUpdate
 
 image:
   repository: grafana/fluent-bit-plugin-loki
-  tag: 1.6.0-amd64
+  tag: 2.1.0-amd64
   pullPolicy: IfNotPresent
   ## Optionally specify an array of imagePullSecrets.
   ## Secrets must be present in the namespace.