diff --git a/docs/index.yaml b/docs/index.yaml
index a80992a..485fdd3 100755
--- a/docs/index.yaml
+++ b/docs/index.yaml
@@ -1,9 +1,24 @@
 apiVersion: v1
 entries:
   pure-csi:
+  - apiVersion: v1
+    appVersion: 1.0.8
+    created: "2020-03-03T14:54:43.1907773-08:00"
+    description: A Helm chart for Pure Service Orchestrator CSI driver
+    digest: cc4eaaef050aba2cbfc23114906c7cdb4166b92392728f80d9d5bc1893c98b91
+    icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-csi/pure-storage.png
+    keywords:
+    - purestorage
+    maintainers:
+    - email: sales@purestorage.com
+      name: Pure Storage, Inc.
+    name: pure-csi
+    urls:
+    - https://purestorage.github.io/helm-charts/pure-csi-1.0.8.tgz
+    version: 1.0.8
   - apiVersion: v1
     appVersion: 1.0.7
-    created: "2020-02-19T11:43:08.6041291-08:00"
+    created: "2020-03-03T14:54:43.1853088-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: a963236c0e8e092780bde1aea127e073bccdd5e25932ee1a4ed433d4c2bd9073
     icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-csi/pure-storage.png
@@ -18,7 +33,7 @@ entries:
     version: 1.0.7
   - apiVersion: v1
     appVersion: 1.0.6
-    created: "2020-02-19T11:43:08.5984044-08:00"
+    created: "2020-03-03T14:54:43.1809427-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: 14e421f095cdb8345c55005b014bf790fbc0ee184bf8a272fb584853468075f1
     icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-csi/pure-storage.png
@@ -33,7 +48,7 @@ entries:
     version: 1.0.6
   - apiVersion: v1
     appVersion: 1.0.5
-    created: "2020-02-19T11:43:08.5928491-08:00"
+    created: "2020-03-03T14:54:43.1759928-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: b78fea541405e5b2c947e6377cfd774e586e8155b440c60557d64d7e08f21878
     icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-csi/pure-storage.png
@@ -48,7 +63,7 @@ entries:
     version: 1.0.5
   - apiVersion: v1
     appVersion: 1.0.4
-    created: "2020-02-19T11:43:08.5869762-08:00"
+    created: "2020-03-03T14:54:43.1703345-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: 8fa619498a6b28bb38e5c449bd8babff8f3e5d645d515c915372603df4b784c9
     icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-csi/pure-storage.png
@@ -63,7 +78,7 @@ entries:
     version: 1.0.4
   - apiVersion: v1
     appVersion: 1.0.3
-    created: "2020-02-19T11:43:08.5817055-08:00"
+    created: "2020-03-03T14:54:43.1654391-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: a95da66a35add00ea441cb63a48e46e7b1826d617e5c2bdcc8a8349498be5414
     icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-csi/pure-storage.png
@@ -78,7 +93,7 @@ entries:
     version: 1.0.3
   - apiVersion: v1
     appVersion: 1.0.2
-    created: "2020-02-19T11:43:08.576494-08:00"
+    created: "2020-03-03T14:54:43.1613207-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: 696a9a4dc0913dd9f5da6a0f11eadfb41348700ca5053c581a42909f712f0869
     icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-csi/pure-storage.png
@@ -93,7 +108,7 @@ entries:
     version: 1.0.2
   - apiVersion: v1
     appVersion: 1.0.1
-    created: "2020-02-19T11:43:08.5702526-08:00"
+    created: "2020-03-03T14:54:43.1572479-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: 382354d38cf8310b7d3a17816489545efc8c62e322db835d0ae2c949f90ef619
     icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-csi/pure-storage.png
@@ -108,7 +123,7 @@ entries:
     version: 1.0.1
   - apiVersion: v1
     appVersion: 1.0.0
-    created: "2020-02-19T11:43:08.56428-08:00"
+    created: "2020-03-03T14:54:43.1522601-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: ffcd6cb34d2e3bb6b47f59630f9a9a5ba769a6580edb12619f3367542d8f98bc
     icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-csi/pure-storage.png
@@ -122,9 +137,24 @@ entries:
     - https://purestorage.github.io/helm-charts/pure-csi-1.0.0.tgz
     version: 1.0.0
   pure-k8s-plugin:
+  - apiVersion: v1
+    appVersion: 2.5.8
+    created: "2020-03-03T14:54:43.2793199-08:00"
+    description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
+    digest: 569d6ad9ef69066b57644c843398cf77ab06809b177ae468b993d7a7b4888b73
+    icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-k8s-plugin/pure-storage.png
+    keywords:
+    - purestorage
+    maintainers:
+    - email: sales@purestorage.com
+      name: Pure Storage, Inc.
+    name: pure-k8s-plugin
+    urls:
+    - https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.5.8.tgz
+    version: 2.5.8
   - apiVersion: v1
     appVersion: 2.5.7
-    created: "2020-02-19T11:43:08.7037861-08:00"
+    created: "2020-03-03T14:54:43.2748895-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
     digest: 872139d3a43749c3976763a95d4fd02e37a71ad9dc5176b4cdba0535b51215f3
     icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-k8s-plugin/pure-storage.png
@@ -139,7 +169,7 @@ entries:
     version: 2.5.7
   - apiVersion: v1
     appVersion: 2.5.6
-    created: "2020-02-19T11:43:08.698651-08:00"
+    created: "2020-03-03T14:54:43.2703569-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
     digest: ecead095aa92188d505fe09883c367bbf7bb37a058aeb2500f5e539b8d9b5b65
     icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-k8s-plugin/pure-storage.png
@@ -154,7 +184,7 @@ entries:
     version: 2.5.6
   - apiVersion: v1
     appVersion: 2.5.5
-    created: "2020-02-19T11:43:08.6934213-08:00"
+    created: "2020-03-03T14:54:43.2649288-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
     digest: 9c0900bbe54ca598df3a834e0a7ac073af75188f3889cd188927a3c6822241bb
     icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-k8s-plugin/pure-storage.png
@@ -169,7 +199,7 @@ entries:
     version: 2.5.5
   - apiVersion: v1
     appVersion: 2.5.4
-    created: "2020-02-19T11:43:08.6883386-08:00"
+    created: "2020-03-03T14:54:43.2604348-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
     digest: 1a3248fe98cc2657b024d251f5642329e57399816d864ae192235ab12abb9f45
     icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-k8s-plugin/pure-storage.png
@@ -184,7 +214,7 @@ entries:
     version: 2.5.4
   - apiVersion: v1
     appVersion: 2.5.2
-    created: "2020-02-19T11:43:08.6812092-08:00"
+    created: "2020-03-03T14:54:43.2554551-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
     digest: ff9cdee3dbed7d71b023f70578408f0ead9d7781fab155a2781aa827c23946ee
     icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-k8s-plugin/pure-storage.png
@@ -199,7 +229,7 @@ entries:
     version: 2.5.2
   - apiVersion: v1
     appVersion: 2.5.1
-    created: "2020-02-19T11:43:08.6765181-08:00"
+    created: "2020-03-03T14:54:43.2510763-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
     digest: 8f05f041c091d0511ab2bd5d70b4e6fb4fd337f3ecb89511d09e3f8391a151cb
     icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-k8s-plugin/pure-storage.png
@@ -214,7 +244,7 @@ entries:
     version: 2.5.1
   - apiVersion: v1
     appVersion: 2.5.0
-    created: "2020-02-19T11:43:08.671366-08:00"
+    created: "2020-03-03T14:54:43.2459113-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
     digest: f5cc239df4afef6546660b529cd0ccc37b32677172a7da9954ab49b04be3e296
     icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-k8s-plugin/pure-storage.png
@@ -229,7 +259,7 @@ entries:
     version: 2.5.0
   - apiVersion: v1
     appVersion: 2.4.1
-    created: "2020-02-19T11:43:08.6654973-08:00"
+    created: "2020-03-03T14:54:43.2396857-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
     digest: d9deb32fe38c10946e79a0841a66d14f77af879f9fcec36d24c03d524ffe6cc9
     icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-k8s-plugin/pure-storage.png
@@ -244,7 +274,7 @@ entries:
     version: 2.4.1
   - apiVersion: v1
     appVersion: 2.4.0
-    created: "2020-02-19T11:43:08.6604353-08:00"
+    created: "2020-03-03T14:54:43.235089-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
     digest: b655dc0d0c40ed43ef30c430c3dac12cec3ab4ba85f4622daf4785ccf3b95dc3
     icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-k8s-plugin/pure-storage.png
@@ -259,7 +289,7 @@ entries:
     version: 2.4.0
   - apiVersion: v1
     appVersion: 2.3.0
-    created: "2020-02-19T11:43:08.6548264-08:00"
+    created: "2020-03-03T14:54:43.2307693-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
     digest: 09aeb2038d26e03fccefa19793de2213ef498de88b9a73e390220b6a71dd098a
     icon: https://github.com/purestorage/helm-charts/tree/master/pure-k8s-plugin/pure-storage.png
@@ -269,7 +299,7 @@ entries:
     version: 2.3.2
   - apiVersion: v1
     appVersion: 2.3.0
-    created: "2020-02-19T11:43:08.6495262-08:00"
+    created: "2020-03-03T14:54:43.2256927-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
     digest: 3b80b7d5da4014178fb71a5a7650d2934a200c1189856fe64a071d5f277ff03e
     icon: https://github.com/purestorage/helm-charts/tree/master/pure-k8s-plugin/pure-storage.png
@@ -278,7 +308,7 @@ entries:
     - https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.3.1.tgz
     version: 2.3.1
   - apiVersion: v1
-    created: "2020-02-19T11:43:08.6436134-08:00"
+    created: "2020-03-03T14:54:43.2212233-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
     digest: 30a1498d2c9af4609d05ceb29016b239ee2437a94c94a87eaea604d0c484441e
     icon: https://github.com/purestorage/helm-charts/tree/master/pure-k8s-plugin/pure-storage.png
@@ -287,7 +317,7 @@ entries:
     - https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.3.0.tgz
     version: 2.3.0
   - apiVersion: v1
-    created: "2020-02-19T11:43:08.638655-08:00"
+    created: "2020-03-03T14:54:43.2169716-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/Openshift
     digest: 81673ebfa1a4380f841d6a705b5dd7c2fab300bfae6007983e58393f7407ac9b
     name: pure-k8s-plugin
@@ -295,7 +325,7 @@ entries:
     - https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.2.1.tgz
     version: 2.2.1
   - apiVersion: v1
-    created: "2020-02-19T11:43:08.6338742-08:00"
+    created: "2020-03-03T14:54:43.213385-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/Openshift
     digest: 23b5296d049f5b2a92b1b2ee9165a0c41178cea88f3bfb6eb560462ae1b5a728
     name: pure-k8s-plugin
@@ -303,7 +333,7 @@ entries:
     - https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.2.0.tgz
     version: 2.2.0
   - apiVersion: v1
-    created: "2020-02-19T11:43:08.628238-08:00"
+    created: "2020-03-03T14:54:43.2098922-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/Openshift
     digest: 939ae58208c7fbd5794a25ab14a715ecff60c79e98616e0954f7e8c16d0ed7dc
     name: pure-k8s-plugin
@@ -311,7 +341,7 @@ entries:
     - https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.1.2.tgz
     version: 2.1.2
   - apiVersion: v1
-    created: "2020-02-19T11:43:08.6230001-08:00"
+    created: "2020-03-03T14:54:43.2055523-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/Openshift
     digest: cad41a8b5278f57c8d953768d9ad28df461af92183f6404d661e33973017a928
     name: pure-k8s-plugin
@@ -319,7 +349,7 @@ entries:
     - https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.1.1.tgz
     version: 2.1.1
   - apiVersion: v1
-    created: "2020-02-19T11:43:08.6183714-08:00"
+    created: "2020-03-03T14:54:43.202156-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/Openshift
     digest: bbccdbdb9426e9f801ae743b64ab9393416f9c097d5bf1d461c76484379faddd
     name: pure-k8s-plugin
@@ -327,7 +357,7 @@ entries:
     - https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.1.0.tgz
     version: 2.1.0
   - apiVersion: v1
-    created: "2020-02-19T11:43:08.6138862-08:00"
+    created: "2020-03-03T14:54:43.198809-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/Openshift
     digest: 05eed477a922dfcd35b3905fc0dcd50aa448fe7123bb6a5517dd9ab709dc906e
     name: pure-k8s-plugin
@@ -335,11 +365,11 @@ entries:
     - https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.0.1.tgz
     version: 2.0.1
   - apiVersion: v1
-    created: "2020-02-19T11:43:08.6093949-08:00"
+    created: "2020-03-03T14:54:43.1950142-08:00"
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/Openshift
     digest: 1cd0d82bf6e38183f70bd4160ddb74be76be355935ad6c41fdc1ef2403686f72
     name: pure-k8s-plugin
     urls:
     - https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.0.0.tgz
     version: 2.0.0
-generated: "2020-02-19T11:43:08.5583144-08:00"
+generated: "2020-03-03T14:54:43.1477658-08:00"
diff --git a/docs/pure-csi-1.0.8.tgz b/docs/pure-csi-1.0.8.tgz
new file mode 100644
index 0000000..0d9caa0
Binary files /dev/null and b/docs/pure-csi-1.0.8.tgz differ
diff --git a/docs/pure-k8s-plugin-2.5.8.tgz b/docs/pure-k8s-plugin-2.5.8.tgz
new file mode 100644
index 0000000..b315891
Binary files /dev/null and b/docs/pure-k8s-plugin-2.5.8.tgz differ
diff --git a/operator-csi-plugin/Dockerfile b/operator-csi-plugin/Dockerfile
index e73a655..d372b3f 100644
--- a/operator-csi-plugin/Dockerfile
+++ b/operator-csi-plugin/Dockerfile
@@ -1,6 +1,6 @@
 FROM quay.io/operator-framework/helm-operator:v0.13.0
 MAINTAINER Pure Storage, Inc.
-LABEL name="pure-csi" vendor="Pure Storage" version="5.0.7" release="1.0" summary="Pure Storage CSI Operator" description="Pure Service Orchestrator CSI Operator"
+LABEL name="pure-csi" vendor="Pure Storage" version="5.0.8" release="1.0" summary="Pure Storage CSI Operator" description="Pure Service Orchestrator CSI Operator"
 COPY helm-charts/ ${HOME}/helm-charts/
 COPY watches.yaml ${HOME}/watches.yaml
 COPY licenses /licenses
diff --git a/operator-csi-plugin/install.sh b/operator-csi-plugin/install.sh
index c05fb08..4a97e52 100755
--- a/operator-csi-plugin/install.sh
+++ b/operator-csi-plugin/install.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-IMAGE=quay.io/purestorage/pso-operator:v5.0.7
+IMAGE=quay.io/purestorage/pso-operator:v5.0.8
 NAMESPACE=pure-csi-operator
 KUBECTL=kubectl
 ORCHESTRATOR=k8s
@@ -53,11 +53,14 @@ while (("$#")); do
     esac
 done
 
-CRDAPIVERSION="$(${KUBECTL} explain CustomResourceDefinition | grep "VERSION:" | awk '{ print $2 }')"
 CLUSTERROLEAPIVERSION="$(${KUBECTL} explain ClusterRole | grep "VERSION:" | awk '{ print $2 }')"
 CLUSTERROLEBINDINGAPIVERSION="$(${KUBECTL} explain ClusterRoleBinding | grep "VERSION:" | awk '{ print $2 }')"
 ROLEAPIVERSION="$(${KUBECTL} explain Role | grep "VERSION:" | awk '{ print $2 }')"
-ROLEBINDINGAPIVERSION="$(${KUBECTL} explain RoleBinding | grep "VERSION:" | awk '{ print $2 }')"
+if [[ "${ORCHESTRATOR}" == "openshift" ]]; then
+    ROLEBINDINGAPIVERSION="rbac.authorization.k8s.io/v1beta1"
+else
+    ROLEBINDINGAPIVERSION="$(${KUBECTL} explain RoleBinding | grep "VERSION:" | awk '{ print $2 }')"
+fi
 DEPLOYMENTAPIVERSION="$(${KUBECTL} explain Deployment | grep "VERSION:" | awk '{ print $2 }')"
 
 if [[ -z ${VALUESFILE} || ! -f ${VALUESFILE} ]]; then
diff --git a/operator-csi-plugin/values.yaml b/operator-csi-plugin/values.yaml
index 88752de..d25009d 100644
--- a/operator-csi-plugin/values.yaml
+++ b/operator-csi-plugin/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   name: purestorage/k8s
-  tag: 5.0.7
+  tag: 5.0.8
   pullPolicy: Always
 
 csi:
diff --git a/operator-k8s-plugin/Dockerfile b/operator-k8s-plugin/Dockerfile
index 4fd338b..ffeca86 100644
--- a/operator-k8s-plugin/Dockerfile
+++ b/operator-k8s-plugin/Dockerfile
@@ -1,6 +1,6 @@
 FROM quay.io/operator-framework/helm-operator:v0.13.0
 MAINTAINER Pure Storage, Inc.
-LABEL name="pure-flex" vendor="Pure Storage" version="2.5.7" release="1.0" summary="Pure Storage FlexDriver Operator" description="Pure Service Orchestrator FlexDriver Operator"
+LABEL name="pure-flex" vendor="Pure Storage" version="2.5.8" release="1.0" summary="Pure Storage FlexDriver Operator" description="Pure Service Orchestrator FlexDriver Operator"
 COPY helm-charts/ ${HOME}/helm-charts/
 COPY watches.yaml ${HOME}/watches.yaml
 COPY licenses /licenses
diff --git a/operator-k8s-plugin/install.sh b/operator-k8s-plugin/install.sh
index 31d053a..8d09071 100755
--- a/operator-k8s-plugin/install.sh
+++ b/operator-k8s-plugin/install.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-IMAGE=quay.io/purestorage/pso-operator:v0.0.10
+IMAGE=quay.io/purestorage/pso-operator:v0.0.11
 NAMESPACE=pso-operator
 KUBECTL=oc
 ORCHESTRATOR=k8s
@@ -53,11 +53,14 @@ while (("$#")); do
     esac
 done
 
-CRDAPIVERSION="$(${KUBECTL} explain CustomResourceDefinition | grep "VERSION:" | awk '{ print $2 }')"
 CLUSTERROLEAPIVERSION="$(${KUBECTL} explain ClusterRole | grep "VERSION:" | awk '{ print $2 }')"
 CLUSTERROLEBINDINGAPIVERSION="$(${KUBECTL} explain ClusterRoleBinding | grep "VERSION:" | awk '{ print $2 }')"
 ROLEAPIVERSION="$(${KUBECTL} explain Role | grep "VERSION:" | awk '{ print $2 }')"
-ROLEBINDINGAPIVERSION="$(${KUBECTL} explain RoleBinding | grep "VERSION:" | awk '{ print $2 }')"
+if [[ "${ORCHESTRATOR}" == "openshift" ]]; then
+    ROLEBINDINGAPIVERSION="rbac.authorization.k8s.io/v1beta1"
+else
+    ROLEBINDINGAPIVERSION="$(${KUBECTL} explain RoleBinding | grep "VERSION:" | awk '{ print $2 }')"
+fi
 DEPLOYMENTAPIVERSION="$(${KUBECTL} explain Deployment | grep "VERSION:" | awk '{ print $2 }')"
 
 if [[ -z ${VALUESFILE} || ! -f ${VALUESFILE} ]]; then
diff --git a/operator-k8s-plugin/values.yaml b/operator-k8s-plugin/values.yaml
index f536b92..2cce687 100644
--- a/operator-k8s-plugin/values.yaml
+++ b/operator-k8s-plugin/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   name: purestorage/k8s
-  tag: 2.5.7
+  tag: 2.5.8
   pullPolicy: Always
 
 # this option is to enable/disable the debug mode of this app
diff --git a/pure-csi/Chart.yaml b/pure-csi/Chart.yaml
index 4aaf55c..ccd15ac 100644
--- a/pure-csi/Chart.yaml
+++ b/pure-csi/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 description: A Helm chart for Pure Service Orchestrator CSI driver
 name: pure-csi
-version: 1.0.7
-appVersion: 1.0.7
+version: 1.0.8
+appVersion: 1.0.8
 icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-csi/pure-storage.png
 keywords:
 - purestorage
diff --git a/pure-csi/README.md b/pure-csi/README.md
index 6ea4ebe..7970b4f 100644
--- a/pure-csi/README.md
+++ b/pure-csi/README.md
@@ -73,7 +73,7 @@ The following table lists the configurable parameters and their default values.
 |             Parameter       |            Description             |                    Default                |
 |-----------------------------|------------------------------------|-------------------------------------------|
 | `image.name`                | The image name       to pull from  | `purestorage/k8s`                         |
-| `image.tag`                 | The image tag to pull              | `5.0.7`                                   |
+| `image.tag`                 | The image tag to pull              | `5.0.8`                                   |
 | `image.pullPolicy`          | Image pull policy                  | `Always      `                            |
 | `app.debug`                 | Enable/disable debug mode for app  | `false`                                   |
 | `storageclass.isPureDefault`| Set `pure` storageclass to the default | `false`                               |
diff --git a/pure-csi/values.yaml b/pure-csi/values.yaml
index 8d6aa47..208919e 100644
--- a/pure-csi/values.yaml
+++ b/pure-csi/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   name: purestorage/k8s
-  tag: 5.0.7
+  tag: 5.0.8
   pullPolicy: Always
 
 csi:
diff --git a/pure-k8s-plugin/Chart.yaml b/pure-k8s-plugin/Chart.yaml
index 09c6c02..14e0b3e 100644
--- a/pure-k8s-plugin/Chart.yaml
+++ b/pure-k8s-plugin/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
 name: pure-k8s-plugin
-version: 2.5.7
-appVersion: 2.5.7
+version: 2.5.8
+appVersion: 2.5.8
 icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-k8s-plugin/pure-storage.png
 keywords:
 - purestorage
diff --git a/pure-k8s-plugin/README.md b/pure-k8s-plugin/README.md
index 6d70404..f2d01c5 100644
--- a/pure-k8s-plugin/README.md
+++ b/pure-k8s-plugin/README.md
@@ -53,7 +53,7 @@ The following table lists the configurable parameters and their default values.
 |             Parameter       |            Description             |                    Default                |
 |-----------------------------|------------------------------------|-------------------------------------------|
 | `image.name`                | The image name       to pull from  | `purestorage/k8s`                         |
-| `image.tag`                 | The image tag to pull              | `2.5.7`                                   |
+| `image.tag`                 | The image tag to pull              | `2.5.8`                                   |
 | `image.pullPolicy`          | Image pull policy                  | `Always`                                  |
 | `app.debug`                 | Enable/disable debug mode for app  | `false`                                   |
 | `storageclass.isPureDefault`| Set `pure` storageclass to the default | `false`                               |
diff --git a/pure-k8s-plugin/values.yaml b/pure-k8s-plugin/values.yaml
index f536b92..2cce687 100644
--- a/pure-k8s-plugin/values.yaml
+++ b/pure-k8s-plugin/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   name: purestorage/k8s
-  tag: 2.5.7
+  tag: 2.5.8
   pullPolicy: Always
 
 # this option is to enable/disable the debug mode of this app