diff --git a/prometheus-ksonnet/lib/config.libsonnet b/prometheus-ksonnet/lib/config.libsonnet
index dfcd8faa1..6fe2404ca 100644
--- a/prometheus-ksonnet/lib/config.libsonnet
+++ b/prometheus-ksonnet/lib/config.libsonnet
@@ -1,8 +1,5 @@
 {
   _config+:: {
-    // Should this prometheus installation be stateful?
-    stateful: false,
-
     // Cluster specific overrides.
     cluster_dns_suffix: 'cluster.local',
 
diff --git a/prometheus-ksonnet/lib/kube-state-metrics.libsonnet b/prometheus-ksonnet/lib/kube-state-metrics.libsonnet
index c44e5cc9a..9ff877705 100644
--- a/prometheus-ksonnet/lib/kube-state-metrics.libsonnet
+++ b/prometheus-ksonnet/lib/kube-state-metrics.libsonnet
@@ -98,9 +98,7 @@
     // Stop the default pod discovery scraping this pod - we use a special
     // scrape config to preserve namespace etc labels.
     deployment.mixin.spec.template.metadata.withAnnotationsMixin({ 'prometheus.io.scrape': 'false' }) +
-    (if $._config.enable_rbac
-     then deployment.mixin.spec.template.spec.withServiceAccount('kube-state-metrics')
-     else {}) +
+    deployment.mixin.spec.template.spec.withServiceAccount('kube-state-metrics') +
     $.util.podPriority('critical'),
 
   kube_state_metrics_service:
diff --git a/prometheus-ksonnet/lib/prometheus.libsonnet b/prometheus-ksonnet/lib/prometheus.libsonnet
index e02d3f241..7cf3c1cd7 100644
--- a/prometheus-ksonnet/lib/prometheus.libsonnet
+++ b/prometheus-ksonnet/lib/prometheus.libsonnet
@@ -2,6 +2,15 @@
   prometheus:: {
     name:: error 'must specify name',
 
+    _config:: $._config,
+
+    // We bounce through various layers of indirection so user can:
+    // a) override config for all Prometheus' by merging into $.prometheus_config,
+    // b) override config for a specific Prometheus instance by merging in here.
+    prometheus_config:: $.prometheus_config,
+    prometheusAlerts:: $.prometheusAlerts,
+    prometheusRules:: $.prometheusRules,
+
     local policyRule = $.rbac.v1beta1.policyRule,
 
     prometheus_rbac:
@@ -16,15 +25,8 @@
         policyRule.withVerbs(['get']),
       ]),
 
-    // We bounce through various layers of indirection so user can:
-    // a) override config for all Prometheus' by merging into $.prometheus_config,
-    // b) override config for a specific Prometheus instance by merging in here.
-    local configMap = $.core.v1.configMap,
 
-    prometheus_config:: $.prometheus_config,
-    prometheusAlerts:: $.prometheusAlerts,
-    prometheusRules:: $.prometheusRules,
-    _config:: $._config,
+    local configMap = $.core.v1.configMap,
 
     prometheus_config_map:
       // Can't reference self.foo below as we're in a map context, so
@@ -44,12 +46,13 @@
 
     prometheus_container::
       local _config = self._config;
+
       container.new('prometheus', $._images.prometheus) +
       container.withPorts($.core.v1.containerPort.new('http-metrics', 80)) +
       container.withArgs([
         '--config.file=/etc/prometheus/prometheus.yml',
         '--web.listen-address=:%s' % _config.prometheus_port,
-        '--web.external-url=%s%s' % [_config.prometheus_external_hostname, _config.prometheus_path],
+        '--web.external-url=%(prometheus_external_hostname)s%(prometheus_path)s' % _config,
         '--web.enable-lifecycle',
         '--web.route-prefix=%s' % _config.prometheus_web_route_prefix,
         '--storage.tsdb.path=/prometheus/data',
@@ -73,75 +76,36 @@
         '-o',
         '-',
         '-sS',
-        'http://localhost:%s%s-/reload' % [_config.prometheus_port, _config.prometheus_web_route_prefix],
+        'http://localhost:%(prometheus_port)s%(prometheus_web_route_prefix)s-/reload' % _config,
       ]),
 
-    local deployment = $.apps.v1beta1.deployment,
-
-    prometheus_deployment:
-      local _config = self._config;
-      if _config.stateful
-      then {}
-      else (
-        deployment.new(self.name, 1, [
-          self.prometheus_container,
-          self.prometheus_watch_container,
-        ]) +
-        $.util.configVolumeMount('%s-config' % self.name, '/etc/prometheus') +
-        deployment.mixin.spec.template.metadata.withAnnotations({ 'prometheus.io.path': '%smetrics' % _config.prometheus_web_route_prefix }) +
-        deployment.mixin.spec.template.spec.securityContext.withRunAsUser(0) +
-        if _config.enable_rbac
-        then deployment.mixin.spec.template.spec.withServiceAccount('prometheus')
-        else {}
-      ),
-
     local pvc = $.core.v1.persistentVolumeClaim,
 
     prometheus_pvc::
-      local _config = self._config;
-      if !(_config.stateful)
-      then {}
-      else (
-        pvc.new() +
-        pvc.mixin.metadata.withName('%s-data' % (self.name)) +
-        pvc.mixin.spec.withAccessModes('ReadWriteOnce') +
-        pvc.mixin.spec.resources.withRequests({ storage: '300Gi' })
-      ),
+      pvc.new() +
+      pvc.mixin.metadata.withName('%s-data' % (self.name)) +
+      pvc.mixin.spec.withAccessModes('ReadWriteOnce') +
+      pvc.mixin.spec.resources.withRequests({ storage: '300Gi' }),
 
     local statefulset = $.apps.v1beta1.statefulSet,
     local volumeMount = $.core.v1.volumeMount,
 
     prometheus_statefulset:
       local _config = self._config;
-      if !(_config.stateful)
-      then {}
-      else (
-        statefulset.new(self.name, 1, [
-          self.prometheus_container.withVolumeMountsMixin(
-            volumeMount.new('%s-data' % self.name, '/prometheus')
-          ),
-          self.prometheus_watch_container,
-        ], self.prometheus_pvc) +
-        $.util.configVolumeMount('%s-config' % self.name, '/etc/prometheus') +
-        statefulset.mixin.spec.withServiceName('prometheus') +
-        statefulset.mixin.spec.template.metadata.withAnnotations({ 'prometheus.io.path': '%smetrics' % _config.prometheus_web_route_prefix }) +
-        statefulset.mixin.spec.template.spec.securityContext.withRunAsUser(0) +
-        (if _config.enable_rbac
-         then statefulset.mixin.spec.template.spec.withServiceAccount(self.name)
-         else {}) +
-        $.util.podPriority('critical')
-      ),
-
-    prometheus_service:
-      local _config = self._config;
-      $.util.serviceFor(
-        if _config.stateful
-        then self.prometheus_statefulset
-        else self.prometheus_deployment
-      ),
-  },
 
-  main_prometheus: $.prometheus {
-    name: 'prometheus',
+      statefulset.new(self.name, 1, [
+        self.prometheus_container.withVolumeMountsMixin(
+          volumeMount.new('%s-data' % self.name, '/prometheus')
+        ),
+        self.prometheus_watch_container,
+      ], self.prometheus_pvc) +
+      $.util.configVolumeMount('%s-config' % self.name, '/etc/prometheus') +
+      statefulset.mixin.spec.withServiceName('prometheus') +
+      statefulset.mixin.spec.template.metadata.withAnnotations({
+        'prometheus.io.path': '%smetrics' % _config.prometheus_web_route_prefix,
+      }) +
+      statefulset.mixin.spec.template.spec.securityContext.withRunAsUser(0) +
+      statefulset.mixin.spec.template.spec.withServiceAccount(self.name) +
+      $.util.podPriority('critical')
   },
 }