diff --git a/jsonnet/kube-prometheus/main.libsonnet b/jsonnet/kube-prometheus/main.libsonnet
index 15f88b7d7f8487959c579586ebf5632f8c3ee688..2a2ad27196f1eaf08def6d85da443b7b90bf9150 100644
--- a/jsonnet/kube-prometheus/main.libsonnet
+++ b/jsonnet/kube-prometheus/main.libsonnet
@@ -18,60 +18,79 @@ local prometheus = import './components/prometheus.libsonnet';
         role: 'alert-rules',
         prometheus: $.values.prometheus.name,
       },
+      versions: {
+        alertmanager: '0.21.0',
+        blackboxExporter: '0.18.0',
+        grafana: '7.3.7',
+        kubeStateMetrics: '1.9.7',
+        nodeExporter: '1.0.1',
+        prometheus: '2.24.0',
+        prometheusAdapter: '0.8.2',
+        prometheusOperator: '0.45.0',
+      },
+      images: {
+        alertmanager: 'quay.io/prometheus/alertmanager:v' + $.values.common.versions.alertmanager,
+        blackboxExporter: 'quay.io/prometheus/blackbox-exporter:v' + $.values.common.versions.blackboxExporter,
+        grafana: 'grafana/grafana:v' + $.values.common.versions.grafana,
+        kubeStateMetrics: 'quay.io/coreos/kube-state-metrics:v' + $.values.common.versions.kubeStateMetrics,
+        nodeExporter: 'quay.io/prometheus/node-exporter:v' + $.values.common.versions.nodeExporter,
+        prometheus: 'quay.io/prometheus/prometheus:v' + $.values.common.versions.prometheus,
+        prometheusAdapter: 'directxman12/k8s-prometheus-adapter:v' + $.values.common.versions.prometheusAdapter,
+        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,
+      },
     },
     alertmanager: {
       name: 'main',
       namespace: $.values.common.namespace,
-      version: '0.21.0',
-      image: 'quay.io/prometheus/alertmanager:v0.21.0',
-      mixin+: {
-        ruleLabels: $.values.common.ruleLabels,
-      },
+      version: $.values.common.versions.alertmanager,
+      image: $.values.common.images.alertmanager,
+      mixin+: { ruleLabels: $.values.common.ruleLabels },
     },
     blackboxExporter: {
       namespace: $.values.common.namespace,
-      version: '0.18.0',
-      image: 'quay.io/prometheus/blackbox-exporter:v0.18.0',
+      version: $.values.common.versions.blackboxExporter,
+      image: $.values.common.images.blackboxExporter,
     },
     grafana: {
       namespace: $.values.common.namespace,
-      version: '7.3.5',
-      image: 'grafana/grafana:v7.3.7',
+      version: $.values.common.versions.grafana,
+      image: $.values.common.images.grafana,
       prometheusName: $.values.prometheus.name,
       // TODO(paulfantom) This should be done by iterating over all objects and looking for object.mixin.grafanaDashboards
       dashboards: $.nodeExporter.mixin.grafanaDashboards + $.prometheus.mixin.grafanaDashboards + $.kubernetesMixin.mixin.grafanaDashboards,
     },
     kubeStateMetrics: {
       namespace: $.values.common.namespace,
-      version: '1.9.7',
-      image: 'quay.io/coreos/kube-state-metrics:v1.9.7',
+      version: $.values.common.versions.kubeStateMetrics,
+      image: $.values.common.images.kubeStateMetrics,
       mixin+: { ruleLabels: $.values.common.ruleLabels },
     },
     nodeExporter: {
       namespace: $.values.common.namespace,
-      version: '1.0.1',
-      image: 'quay.io/prometheus/node-exporter:v1.0.1',
+      version: $.values.common.versions.nodeExporter,
+      image: $.values.common.images.nodeExporter,
       mixin+: { ruleLabels: $.values.common.ruleLabels },
     },
     prometheus: {
       namespace: $.values.common.namespace,
-      version: '2.24.0',
-      image: 'quay.io/prometheus/prometheus:v2.24.0',
+      version: $.values.common.versions.prometheus,
+      image: $.values.common.images.prometheus,
       name: 'k8s',
       alertmanagerName: $.values.alertmanager.name,
       mixin+: { ruleLabels: $.values.common.ruleLabels },
     },
     prometheusAdapter: {
       namespace: $.values.common.namespace,
-      version: '0.8.2',
-      image: 'directxman12/k8s-prometheus-adapter:v0.8.2',
+      version: $.values.common.versions.prometheusAdapter,
+      image: $.values.common.images.prometheusAdapter,
       prometheusURL: 'http://prometheus-' + $.values.prometheus.name + '.' + $.values.common.namespace + '.svc.cluster.local:9090/',
     },
     prometheusOperator: {
       namespace: $.values.common.namespace,
-      version: '0.45.0',
-      image: 'quay.io/prometheus-operator/prometheus-operator:v0.45.0',
-      configReloaderImage: 'quay.io/prometheus-operator/prometheus-config-reloader:v0.45.0',
+      version: $.values.common.versions.prometheusOperator,
+      image: $.values.common.images.prometheusOperator,
+      configReloaderImage: $.values.common.images.prometheusOperatorReloader,
       commonLabels+: {
         'app.kubernetes.io/part-of': 'kube-prometheus',
       },
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index 18ee57bace54951818ca8a0e7c7e0d8ca2e59699..c8b74e86ac8f50b91964bc3210834987ecad5b61 100644
--- a/manifests/grafana-dashboardDatasources.yaml
+++ b/manifests/grafana-dashboardDatasources.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: grafana
     app.kubernetes.io/name: grafana
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 7.3.5
+    app.kubernetes.io/version: 7.3.7
   name: grafana-datasources
   namespace: monitoring
 type: Opaque
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 5836c3acd1f7ef4393701bace7dbceeefe876be0..98c46e7f1f2d69d96ec11b9ca151b5576aeff0dc 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -1733,7 +1733,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-apiserver
     namespace: monitoring
 - apiVersion: v1
@@ -3604,7 +3604,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-cluster-total
     namespace: monitoring
 - apiVersion: v1
@@ -4744,7 +4744,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-controller-manager
     namespace: monitoring
 - apiVersion: v1
@@ -7315,7 +7315,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-k8s-resources-cluster
     namespace: monitoring
 - apiVersion: v1
@@ -9590,7 +9590,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-k8s-resources-namespace
     namespace: monitoring
 - apiVersion: v1
@@ -10557,7 +10557,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-k8s-resources-node
     namespace: monitoring
 - apiVersion: v1
@@ -12318,7 +12318,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-k8s-resources-pod
     namespace: monitoring
 - apiVersion: v1
@@ -14341,7 +14341,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-k8s-resources-workload
     namespace: monitoring
 - apiVersion: v1
@@ -16525,7 +16525,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-k8s-resources-workloads-namespace
     namespace: monitoring
 - apiVersion: v1
@@ -19047,7 +19047,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-kubelet
     namespace: monitoring
 - apiVersion: v1
@@ -20500,7 +20500,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-namespace-by-pod
     namespace: monitoring
 - apiVersion: v1
@@ -22225,7 +22225,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-namespace-by-workload
     namespace: monitoring
 - apiVersion: v1
@@ -23178,7 +23178,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-node-cluster-rsrc-use
     namespace: monitoring
 - apiVersion: v1
@@ -24158,7 +24158,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-node-rsrc-use
     namespace: monitoring
 - apiVersion: v1
@@ -25144,7 +25144,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-nodes
     namespace: monitoring
 - apiVersion: v1
@@ -25710,7 +25710,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-persistentvolumesusage
     namespace: monitoring
 - apiVersion: v1
@@ -26927,7 +26927,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-pod-total
     namespace: monitoring
 - apiVersion: v1
@@ -28586,7 +28586,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-prometheus-remote-write
     namespace: monitoring
 - apiVersion: v1
@@ -29802,7 +29802,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-prometheus
     namespace: monitoring
 - apiVersion: v1
@@ -31022,7 +31022,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-proxy
     namespace: monitoring
 - apiVersion: v1
@@ -32085,7 +32085,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-scheduler
     namespace: monitoring
 - apiVersion: v1
@@ -33002,7 +33002,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-statefulset
     namespace: monitoring
 - apiVersion: v1
@@ -34429,7 +34429,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-workload-total
     namespace: monitoring
 kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index ca27f99e50cc316096c50d8823a5b0b085017c0d..4cbedc783a8776a03147f48e267545c0a0af7d41 100644
--- a/manifests/grafana-dashboardSources.yaml
+++ b/manifests/grafana-dashboardSources.yaml
@@ -21,6 +21,6 @@ metadata:
     app.kubernetes.io/component: grafana
     app.kubernetes.io/name: grafana
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 7.3.5
+    app.kubernetes.io/version: 7.3.7
   name: grafana-dashboards
   namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 0f73af5a06c9b667d446043ecae4bb12c3fac91c..4094d70b73122732a45b1addcf1fa2d619a82e62 100644
--- a/manifests/grafana-deployment.yaml
+++ b/manifests/grafana-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: grafana
     app.kubernetes.io/name: grafana
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 7.3.5
+    app.kubernetes.io/version: 7.3.7
   name: grafana
   namespace: monitoring
 spec:
@@ -18,16 +18,16 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/grafana-datasources: a77789e5440a1e51e204e99e2f0f480a
+        checksum/grafana-datasources: b559161af8b85c237ef0432d8431a19a
       labels:
         app.kubernetes.io/component: grafana
         app.kubernetes.io/name: grafana
         app.kubernetes.io/part-of: kube-prometheus
-        app.kubernetes.io/version: 7.3.5
+        app.kubernetes.io/version: 7.3.7
     spec:
       containers:
       - env: []
-        image: grafana/grafana:7.3.5
+        image: grafana/grafana:7.3.7
         name: grafana
         ports:
         - containerPort: 3000
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index 32a907461bd98551fbf47b1bc4f5027ce6c81eb2..7dba3e256b2be5c80d722d332bbacfaecd4fab9f 100644
--- a/manifests/grafana-service.yaml
+++ b/manifests/grafana-service.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: grafana
     app.kubernetes.io/name: grafana
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 7.3.5
+    app.kubernetes.io/version: 7.3.7
   name: grafana
   namespace: monitoring
 spec:
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index 9931c1cac24f9b5732fbb329717d3d35b17b80ba..59099c4d88b5ee7e0a5eed3a9680ed9e181eec75 100644
--- a/manifests/grafana-serviceMonitor.yaml
+++ b/manifests/grafana-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: grafana
     app.kubernetes.io/name: grafana
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 7.3.5
+    app.kubernetes.io/version: 7.3.7
   name: grafana
   namespace: monitoring
 spec: