diff --git a/ceph/templates/bin/pool/_init.sh.tpl b/ceph/templates/bin/pool/_init.sh.tpl
index dd52b67b1e..5805f44cb5 100644
--- a/ceph/templates/bin/pool/_init.sh.tpl
+++ b/ceph/templates/bin/pool/_init.sh.tpl
@@ -53,6 +53,12 @@ function create_pool () {
   fi
   ceph --cluster "${CLUSTER}" osd pool set "${POOL_NAME}" size ${POOL_REPLICATION}
   ceph --cluster "${CLUSTER}" osd pool set "${POOL_NAME}" crush_rule "${POOL_CRUSH_RULE}"
+  for PG_PARAM in pg_num pgp_num; do
+    CURRENT_PG_VALUE=$(ceph --cluster ceph osd pool get "${POOL_NAME}" "${PG_PARAM}" | awk "/^${PG_PARAM}:/ { print \$NF }")
+    if [ "${POOL_PLACEMENT_GROUPS}" -gt "${CURRENT_PG_VALUE}" ]; then
+      ceph --cluster ceph osd pool set "${POOL_NAME}" "${PG_PARAM}" "${POOL_PLACEMENT_GROUPS}"
+    fi
+  done
 }
 
 function manage_pool () {
diff --git a/ceph/values.yaml b/ceph/values.yaml
index df7c7d80aa..846d338cee 100644
--- a/ceph/values.yaml
+++ b/ceph/values.yaml
@@ -25,13 +25,13 @@ images:
   tags:
     ceph_bootstrap: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04'
     ceph_cephfs_provisioner: 'quay.io/external_storage/cephfs-provisioner:v0.1.1'
-    ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.0'
+    ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.1'
     ceph_mds: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04'
     ceph_mgr: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04'
     ceph_mon: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04'
-    ceph_mon_check: 'docker.io/port/ceph-config-helper:v1.10.0'
+    ceph_mon_check: 'docker.io/port/ceph-config-helper:v1.10.1'
     ceph_osd: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04'
-    ceph_rbd_pool: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04'
+    ceph_rbd_pool: 'docker.io/port/ceph-config-helper:v1.10.1'
     ceph_rbd_provisioner: 'quay.io/external_storage/rbd-provisioner:v0.1.1'
     ceph_rgw: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04'
     dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.0'
diff --git a/tools/images/ceph-config-helper/Dockerfile b/tools/images/ceph-config-helper/Dockerfile
index 92b1f7b57b..0222b9f8f0 100644
--- a/tools/images/ceph-config-helper/Dockerfile
+++ b/tools/images/ceph-config-helper/Dockerfile
@@ -1,7 +1,7 @@
 FROM docker.io/ubuntu:xenial
 MAINTAINER pete.birley@att.com
 
-ARG KUBE_VERSION=v1.10.0
+ARG KUBE_VERSION=v1.10.1
 ARG CEPH_RELEASE=luminous
 
 ADD https://download.ceph.com/keys/release.asc /etc/apt/ceph-release.asc
@@ -14,13 +14,17 @@ RUN set -ex ;\
     cd ${TMP_DIR} ;\
     apt-get update ;\
     apt-get dist-upgrade -y ;\
-    apt-get install -y \
+    apt-get install --no-install-recommends -y \
         apt-transport-https \
         ca-certificates \
         ceph \
         curl \
         python \
         jq ;\
+    curl -sSL https://bootstrap.pypa.io/get-pip.py | python ;\
+    pip --no-cache-dir install --upgrade \
+      crush \
+      six ;\
     curl -sSL https://dl.k8s.io/${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz | tar -zxv --strip-components=1 ;\
     mv ${TMP_DIR}/client/bin/kubectl /usr/bin/kubectl ;\
     chmod +x /usr/bin/kubectl ;\
diff --git a/tools/images/ceph-config-helper/Makefile b/tools/images/ceph-config-helper/Makefile
index 9bb35486c4..ff51d32ca7 100644
--- a/tools/images/ceph-config-helper/Makefile
+++ b/tools/images/ceph-config-helper/Makefile
@@ -19,7 +19,7 @@ DOCKER_REGISTRY            ?= docker.io
 IMAGE_NAME                 ?= ceph-config-helper
 IMAGE_PREFIX               ?= openstackhelm
 IMAGE_TAG                  ?= latest
-KUBE_VERSION               ?= v1.10.0
+KUBE_VERSION               ?= v1.10.1
 LABEL                      ?= putlabelshere
 
 IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
diff --git a/tools/images/ceph-config-helper/README.rst b/tools/images/ceph-config-helper/README.rst
index 6ccf909f30..82f4b31d85 100644
--- a/tools/images/ceph-config-helper/README.rst
+++ b/tools/images/ceph-config-helper/README.rst
@@ -31,7 +31,7 @@ repo run:
 
 .. code:: bash
 
-    export KUBE_VERSION=v1.10.0
+    export KUBE_VERSION=v1.10.1
     sudo docker build \
       --network host \
       --build-arg KUBE_VERSION=${KUBE_VERSION} \