diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
index 71369ac3daf09801e400f58aed4c0b6a0fb5f4f4..1670ca5ddbba54b44bc1d6675b17a01c11ef47ae 100644
--- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
@@ -1,6 +1,7 @@
 local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
 local k3 = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.3/k.libsonnet';
 local configMapList = k3.core.v1.configMapList;
+local kubeRbacProxyContainer = import './kube-rbac-proxy/container.libsonnet';
 
 (import 'github.com/brancz/kubernetes-grafana/grafana/grafana.libsonnet') +
 (import './kube-state-metrics/kube-state-metrics.libsonnet') +
@@ -60,7 +61,7 @@ local configMapList = k3.core.v1.configMapList;
       ],
     },
   } +
-  ((import 'kube-prometheus/kube-rbac-proxy/container.libsonnet') {
+  (kubeRbacProxyContainer {
     config+:: {
       kubeRbacProxy: {
         local cfg = self,
diff --git a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
index a313e7b1f4ec471504fd45ed157bf4d29ec25628..8fa643f0f2506c3dd6c0e4b8d5dd41438e6248da 100644
--- a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
+++ b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
@@ -1,3 +1,6 @@
+local kubeRbacProxyContainer = import '../kube-rbac-proxy/container.libsonnet';
+local ksm = import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics/kube-state-metrics.libsonnet';
+
 {
   _config+:: {
     versions+:: {
@@ -11,9 +14,9 @@
       scrapeTimeout: '30s',
     },
   },
-  kubeStateMetrics+:: (import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics/kube-state-metrics.libsonnet') +
-                      {
-                        local ksm = self,
+  kubeStateMetrics+::
+    ksm + {
+                        local version = self.version,
                         name:: 'kube-state-metrics',
                         namespace:: $._config.namespace,
                         version:: $._config.versions.kubeStateMetrics,
@@ -57,7 +60,7 @@
                               namespace: $._config.namespace,
                               labels: {
                                 'app.kubernetes.io/name': 'kube-state-metrics',
-                                'app.kubernetes.io/version': ksm.version,
+                                'app.kubernetes.io/version': version,
                               },
                             },
                             spec: {
@@ -98,7 +101,7 @@
                             },
                           },
                       } +
-                      ((import 'kube-prometheus/kube-rbac-proxy/container.libsonnet') {
+                      (kubeRbacProxyContainer {
                          config+:: {
                            kubeRbacProxy: {
                              local cfg = self,
@@ -112,7 +115,7 @@
                            },
                          },
                        }).deploymentMixin +
-                      ((import 'kube-prometheus/kube-rbac-proxy/container.libsonnet') {
+                      (kubeRbacProxyContainer {
                          config+:: {
                            kubeRbacProxy: {
                              local cfg = self,