diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml
index 923f3151c5..da420286ab 100644
--- a/stable/prometheus-operator/Chart.yaml
+++ b/stable/prometheus-operator/Chart.yaml
@@ -10,7 +10,7 @@ name: prometheus-operator
 sources:
   - https://github.com/coreos/prometheus-operator
   - https://coreos.com/operators/prometheus
-version: 6.11.0
+version: 6.11.1
 appVersion: 0.32.0
 home: https://github.com/coreos/prometheus-operator
 keywords:
diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml
index 5d1438a83d..11a28cb944 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml
@@ -10,7 +10,10 @@ metadata:
     app: {{ template "prometheus-operator.name" $ }}-admission-create
 {{- include "prometheus-operator.labels" $ | indent 4 }}
 spec:
+  {{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }}
+  # Alpha feature since k8s 1.12
   ttlSecondsAfterFinished: 0
+  {{- end }}
   template:
     metadata:
       name:  {{ template "prometheus-operator.fullname" . }}-admission-create
@@ -43,4 +46,4 @@ spec:
       securityContext:
         runAsNonRoot: true
         runAsUser: 2000
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml
index a05fdb05c6..6f1a94fd38 100644
--- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml
+++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml
@@ -10,7 +10,10 @@ metadata:
     app: {{ template "prometheus-operator.name" $ }}-admission-patch
 {{- include "prometheus-operator.labels" $ | indent 4 }}
 spec:
+  {{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }}
+  # Alpha feature since k8s 1.12
   ttlSecondsAfterFinished: 0
+  {{- end }}
   template:
     metadata:
       name:  {{ template "prometheus-operator.fullname" . }}-admission-patch
@@ -44,4 +47,4 @@ spec:
       securityContext:
         runAsNonRoot: true
         runAsUser: 2000
-{{- end }}
\ No newline at end of file
+{{- end }}