diff --git a/README.md b/README.md
index bad0188c6f356f0ed866c7f27319d3e7f0835a9b..1dd9952258bf1cdcb2d9201d03ca4e41830aa0b1 100644
--- a/README.md
+++ b/README.md
@@ -105,13 +105,13 @@ $ minikube addons disable metrics-server
 
 The following versions are supported and work as we test against these versions in their respective branches. But note that other versions might work!
 
-| kube-prometheus stack | Kubernetes 1.18 | Kubernetes 1.19 | Kubernetes 1.20 | Kubernetes 1.21 |
-|-----------------------|-----------------|-----------------|-----------------|-----------------|
-| `release-0.5`         | ✔               | ✗               | ✗               | ✗               |
-| `release-0.6`         | ✗               | ✔               | ✗               | ✗               |
-| `release-0.7`         | ✗               | ✔               | ✔               | ✗               |
-| `release-0.8`         | ✗               | ✗               | ✔               | ✔               |
-| `HEAD`                | ✗               | ✗               | ✔               | ✔               |
+| kube-prometheus stack                                                                            | Kubernetes 1.18 | Kubernetes 1.19 | Kubernetes 1.20 | Kubernetes 1.21 |
+|--------------------------------------------------------------------------------------------------|-----------------|-----------------|-----------------|-----------------|
+| [`release-0.5`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.5)         | ✔               | ✗               | ✗               | ✗               |
+| [`release-0.6`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.6)         | ✗               | ✔               | ✗               | ✗               |
+| [`release-0.7`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.7)         | ✗               | ✔               | ✔               | ✗               |
+| [`release-0.8`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.8)         | ✗               | ✗               | ✔               | ✔               |
+| [`HEAD`](https://github.com/prometheus-operator/kube-prometheus/tree/main)                       | ✗               | ✗               | ✔               | ✔               |
 
 ## Quickstart
 
diff --git a/jsonnet/kube-prometheus/addons/anti-affinity.libsonnet b/jsonnet/kube-prometheus/addons/anti-affinity.libsonnet
index 2053e950a9bfcb3405bccefa79a3a8fe4ad4be1f..f71c4589901d0f9fa32847134a2b96c1c93fa765 100644
--- a/jsonnet/kube-prometheus/addons/anti-affinity.libsonnet
+++ b/jsonnet/kube-prometheus/addons/anti-affinity.libsonnet
@@ -18,7 +18,7 @@
     },
   },
 
-  local antiaffinity(labelSelector, namespace, type, topologyKey) = {
+  antiaffinity(labelSelector, namespace, type, topologyKey): {
     local podAffinityTerm = {
       namespaces: [namespace],
       topologyKey: topologyKey,
@@ -44,7 +44,7 @@
   alertmanager+: {
     alertmanager+: {
       spec+:
-        antiaffinity(
+        $.antiaffinity(
           $.alertmanager._config.selectorLabels,
           $.values.common.namespace,
           $.values.alertmanager.podAntiAffinity,
@@ -56,7 +56,7 @@
   prometheus+: {
     prometheus+: {
       spec+:
-        antiaffinity(
+        $.antiaffinity(
           $.prometheus._config.selectorLabels,
           $.values.common.namespace,
           $.values.prometheus.podAntiAffinity,
@@ -70,7 +70,7 @@
       spec+: {
         template+: {
           spec+:
-            antiaffinity(
+            $.antiaffinity(
               $.blackboxExporter._config.selectorLabels,
               $.values.common.namespace,
               $.values.blackboxExporter.podAntiAffinity,
@@ -86,7 +86,7 @@
       spec+: {
         template+: {
           spec+:
-            antiaffinity(
+            $.antiaffinity(
               $.prometheusAdapter._config.selectorLabels,
               $.values.common.namespace,
               $.values.prometheusAdapter.podAntiAffinity,
diff --git a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
index bd61e25f4b9f407249dda8a06e8dceb66c87b38b..8bed7b84f833750f6894bd54f81779960edfeb14 100644
--- a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
+++ b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
@@ -22,6 +22,7 @@ local defaults = {
   },
   configmapReloaderImage: 'jimmidyson/configmap-reload:v0.5.0',
   kubeRbacProxyImage: error 'must provide kubeRbacProxyImage',
+  
 
   port: 9115,
   internalPort: 19115,
diff --git a/jsonnet/kube-prometheus/components/grafana.libsonnet b/jsonnet/kube-prometheus/components/grafana.libsonnet
index 5d2eeb5be864d4114b38125f0bd6a103cd25727e..f45d75f8f3173077feea68fcba3863d3eb4beeba 100644
--- a/jsonnet/kube-prometheus/components/grafana.libsonnet
+++ b/jsonnet/kube-prometheus/components/grafana.libsonnet
@@ -3,8 +3,7 @@ local defaults = {
   name: 'grafana',
   namespace: error 'must provide namespace',
   version: error 'must provide version',
-  // image: error 'must provide image',
-  imageRepos: 'grafana/grafana',
+  image: error 'must provide image',
   resources: {
     requests: { cpu: '100m', memory: '100Mi' },
     limits: { cpu: '200m', memory: '200Mi' },
@@ -44,7 +43,7 @@ function(params) {
         grafana: g._config.version,
       },
       imageRepos+:: {
-        grafana: g._config.imageRepos,
+        grafana: std.split(g._config.image, ':')[0],
       },
       prometheus+:: {
         name: g._config.prometheusName,
diff --git a/jsonnet/kube-prometheus/main.libsonnet b/jsonnet/kube-prometheus/main.libsonnet
index a1a62bbcdd899ac7e3062c5fb3f8e435f739721c..a9b68896b7cc4b3194ca15cf6db8fc9334d6b6f5 100644
--- a/jsonnet/kube-prometheus/main.libsonnet
+++ b/jsonnet/kube-prometheus/main.libsonnet
@@ -31,6 +31,7 @@ local platformPatch = import './platforms/platforms.libsonnet';
         prometheusAdapter: error 'must provide version',
         prometheusOperator: error 'must provide version',
         kubeRbacProxy: error 'must provide version',
+        configmapReload: error 'must provide version',
       } + (import 'versions.json'),
       images: {
         alertmanager: 'quay.io/prometheus/alertmanager:v' + $.values.common.versions.alertmanager,
@@ -43,6 +44,7 @@ local platformPatch = import './platforms/platforms.libsonnet';
         prometheusOperator: 'quay.io/prometheus-operator/prometheus-operator:v' + $.values.common.versions.prometheusOperator,
         prometheusOperatorReloader: 'quay.io/prometheus-operator/prometheus-config-reloader:v' + $.values.common.versions.prometheusOperator,
         kubeRbacProxy: 'quay.io/brancz/kube-rbac-proxy:v' + $.values.common.versions.kubeRbacProxy,
+        configmapReload: 'jimmidyson/configmap-reload:v' + $.values.common.versions.configmapReload,
       },
     },
     alertmanager: {
@@ -57,6 +59,7 @@ local platformPatch = import './platforms/platforms.libsonnet';
       version: $.values.common.versions.blackboxExporter,
       image: $.values.common.images.blackboxExporter,
       kubeRbacProxyImage: $.values.common.images.kubeRbacProxy,
+      configmapReloaderImage: $.values.common.images.configmapReload,
     },
     grafana: {
       namespace: $.values.common.namespace,
diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index ca9e236864a97aeedf2069a5c2ce74c01fd1b95a..d0bfa1607e49e1c5126a0d99b1ce3e19ce772e4c 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -8,4 +8,5 @@
   "prometheusAdapter": "0.8.4",
   "prometheusOperator": "0.47.0",
   "kubeRbacProxy": "0.8.0"
+  "configmapReload": "0.5.0"
 }
\ No newline at end of file