diff --git a/cluster/addons/prometheus/prometheus-pvc.yaml b/cluster/addons/prometheus/prometheus-pvc.yaml
deleted file mode 100644
index 0ec1fe1d9cc..00000000000
--- a/cluster/addons/prometheus/prometheus-pvc.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: prometheus
-  namespace: kube-system
-  labels:
-    kubernetes.io/cluster-service: "true"
-    addonmanager.kubernetes.io/mode: Reconcile
-spec:
-  storageClassName: standard
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: "16Gi"
diff --git a/cluster/addons/prometheus/prometheus-deployment.yaml b/cluster/addons/prometheus/prometheus-statefulset.yaml
similarity index 86%
rename from cluster/addons/prometheus/prometheus-deployment.yaml
rename to cluster/addons/prometheus/prometheus-statefulset.yaml
index dd9635d85cf..2b1e8ff82c2 100644
--- a/cluster/addons/prometheus/prometheus-deployment.yaml
+++ b/cluster/addons/prometheus/prometheus-statefulset.yaml
@@ -1,5 +1,5 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
+apiVersion: apps/v1
+kind: StatefulSet
 metadata:
   name: prometheus 
   namespace: kube-system
@@ -9,16 +9,18 @@ metadata:
     addonmanager.kubernetes.io/mode: Reconcile
     version: v2.2.1
 spec:
+  serviceName: "prometheus"
   replicas: 1
+  podManagementPolicy: "Parallel"
+  updateStrategy:
+   type: "RollingUpdate"
   selector:
     matchLabels:
       k8s-app: prometheus
-      version: v2.2.1
   template:
     metadata:
       labels:
         k8s-app: prometheus
-        version: v2.2.1
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
@@ -30,7 +32,7 @@ spec:
         imagePullPolicy: "IfNotPresent"
         command: ["chown", "-R", "65534:65534", "/data"]
         volumeMounts:
-        - name: storage-volume
+        - name: prometheus-data
           mountPath: /data
           subPath: ""
       containers:
@@ -87,7 +89,7 @@ spec:
           volumeMounts:
             - name: config-volume
               mountPath: /etc/config
-            - name: storage-volume
+            - name: prometheus-data
               mountPath: /data
               subPath: ""
       terminationGracePeriodSeconds: 300
@@ -95,6 +97,13 @@ spec:
         - name: config-volume
           configMap:
             name: prometheus-config
-        - name: storage-volume
-          persistentVolumeClaim:
-            claimName: prometheus
+  volumeClaimTemplates:
+  - metadata:
+      name: prometheus-data
+    spec:
+      storageClassName: standard
+      accessModes:
+        - ReadWriteOnce
+      resources:
+        requests:
+          storage: "16Gi"