diff --git a/images/lorax-build/Dockerfile b/images/lorax-build/Dockerfile
index 04a30023..eca3de10 100644
--- a/images/lorax-build/Dockerfile
+++ b/images/lorax-build/Dockerfile
@@ -32,7 +32,7 @@ RUN yum update -y && yum install -y \
 # Note we install kubeadm only so we can snag a list of its required images with the config shipped
 # for this version of kubeadm (matches the one we install with our installer iso).
 
-RUN gem install --no-ri --no-rdoc fpm
+RUN gem install --no-ri --no-rdoc fpm -f
 
 COPY images/lorax-build/lorax.conf /etc/lorax/
 
diff --git a/pkg/clients/elastic/arrays.go b/pkg/clients/elastic/arrays.go
index 244b7247..9ac3d8e9 100644
--- a/pkg/clients/elastic/arrays.go
+++ b/pkg/clients/elastic/arrays.go
@@ -40,6 +40,10 @@ func (c *Client) FindArrays(query *resources.ArrayQuery) ([]*resources.Array, er
 	searchService := c.esclient.Search(arraysIndexName).Type("_doc").Query(query.GenerateElasticQueryObject()).From(query.Offset).IgnoreUnavailable(true).AllowNoIndices(true)
 	if query.Limit > 0 {
 		searchService.Size(query.Limit)
+	} else {
+		// Default to 1000 results if not specified (should be bigger than any "practical" fleet size to ensure returning
+		// all results)
+		searchService.Size(1000)
 	}
 	if len(query.Sort) > 0 {
 		sortParam, err := query.GetSortParameter()
diff --git a/scripts/build/build_lorax_image.sh b/scripts/build/build_lorax_image.sh
index 04e23c55..7b522602 100755
--- a/scripts/build/build_lorax_image.sh
+++ b/scripts/build/build_lorax_image.sh
@@ -19,6 +19,7 @@ if [[ -z "${KUBEVERSION}" ]]; then
 fi
 
 docker build \
+    --no-cache \
     -t lorax-build:${VERSION} \
     --build-arg "KUBERNETES_VERSION=${KUBEVERSION}" \
     -f ${REPO_ROOT}/images/lorax-build/Dockerfile \