diff --git a/ceph-client/Chart.yaml b/ceph-client/Chart.yaml
index b2b05350..3c7363c9 100644
--- a/ceph-client/Chart.yaml
+++ b/ceph-client/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Client
 name: ceph-client
-version: 0.1.15
+version: 0.1.16
 home: https://github.com/ceph/ceph-client
 ...
diff --git a/ceph-client/templates/bin/pool/_init.sh.tpl b/ceph-client/templates/bin/pool/_init.sh.tpl
index 70a77191..ec81a96c 100644
--- a/ceph-client/templates/bin/pool/_init.sh.tpl
+++ b/ceph-client/templates/bin/pool/_init.sh.tpl
@@ -42,9 +42,9 @@ function wait_for_pgs () {
   # Loop until all pgs are active
   while [[ $pgs_ready -lt 3 ]]; do
     pgs_state=$(ceph --cluster ${CLUSTER} pg ls -f json | jq -c "${query}")
-    if [[ $(jq -c '. | select(.state | contains("peer") or contains("activating") | not)' <<< "${pgs_state}") ]]; then
-      # If inactive PGs aren't peering, fail
-      echo "Failure, found inactive PGs that aren't peering"
+    if [[ $(jq -c '. | select(.state | contains("peer") or contains("activating") or contains("recover") or contains("unknown") or contains("creating") | not)' <<< "${pgs_state}") ]]; then
+      # If inactive PGs aren't in the allowed set of states above, fail
+      echo "Failure, found inactive PGs that aren't in the allowed set of states"
       exit 1
     fi
     if [[ "${pgs_state}" ]]; then
diff --git a/releasenotes/notes/ceph-client.yaml b/releasenotes/notes/ceph-client.yaml
index 1ac93bf7..fb36e57f 100644
--- a/releasenotes/notes/ceph-client.yaml
+++ b/releasenotes/notes/ceph-client.yaml
@@ -16,4 +16,5 @@ ceph-client:
   - 0.1.13 Fix ceph-client helm test
   - 0.1.14 Allow Ceph RBD pool job to leave failed pods
   - 0.1.15 Make ceph-client helm test more PG specific
+  - 0.1.16 Make Ceph pool init job consistent with helm test
 ...