diff --git a/charts/maas/templates/bin/_export-api-key.sh.tpl b/charts/maas/templates/bin/_export-api-key.sh.tpl
index c697658..72a060a 100644
--- a/charts/maas/templates/bin/_export-api-key.sh.tpl
+++ b/charts/maas/templates/bin/_export-api-key.sh.tpl
@@ -56,11 +56,11 @@ if [ "x$KEY" != "x" ]; then
 }
 EOS
     while true; do
-        result=$(post_secret)
-        if [ ! -z "$(echo $result | grep 201)" ]; then
+        export result=$(post_secret)
+        if [ ! -z "$(echo "$result" | grep -i '201 Created')" ]; then
             echo 'Secret created'
             break
-        elif [ ! -z "$(echo $result | grep 409)" ]; then
+        elif [ ! -z "$(echo "$result" | grep -i '409 Conflict')" ]; then
             echo 'Secret exists, clearing before trying again'
             clear_secret
         else
diff --git a/charts/maas/templates/bin/_import-boot-resources.sh.tpl b/charts/maas/templates/bin/_import-boot-resources.sh.tpl
index a631c64..e4aea0b 100644
--- a/charts/maas/templates/bin/_import-boot-resources.sh.tpl
+++ b/charts/maas/templates/bin/_import-boot-resources.sh.tpl
@@ -16,22 +16,50 @@
 
 set -ex
 
+import_tries=0
+
+TRY_LIMIT=${TRY_LIMIT:-1}
+JOB_TIMEOUT=${JOB_TIMEOUT:-900}
+RETRY_TIMER=${RETRY_TIMER:-30}
+
+function start_import {
+    while [[ ${import_tries} -lt $TRY_LIMIT ]]
+    do
+        import_tries=$(($import_tries + 1))
+        echo "Starting image import try ${import_tries}..."
+        maas ${ADMIN_USERNAME} boot-resources import
+        check_for_download
+        if [[ $? -eq 0 ]]
+        then
+            echo "Image import success!"
+            return 0
+        fi
+    done
+    return 1
+}
+
 function check_for_download {
 
     while [[ ${JOB_TIMEOUT} -gt 0 ]]; do
         if maas ${ADMIN_USERNAME} boot-resources is-importing | grep -q 'true';
         then
             echo -e '\nBoot resources currently importing\n'
-            let TIMEOUT-=${RETRY_TIMER}
+            let JOB_TIMEOUT-=${RETRY_TIMER}
             sleep ${RETRY_TIMER}
         else
-            echo 'Boot resources have completed importing'
-            # TODO(sthussey) Need to check synced images exist - could be a import failure
-            return 0
+            synced_imgs=$(maas ${ADMIN_USERNAME} boot-resources read | grep -B 3 'Synced' | grep 'ubuntu' | wc -l)
+            if [[ $synced_imgs -gt 0 ]]
+            then
+                echo 'Boot resources have completed importing'
+                return 0
+            else
+                echo 'Import failed!'
+                return 1
+            fi
         fi
     done
-    exit 1
-
+    echo "Timeout waiting for import!"
+    return 1
 }
 
 function configure_proxy {
@@ -74,8 +102,11 @@ configure_dns
 
 # make call to import images
 configure_boot_sources
-maas ${ADMIN_USERNAME} boot-resources import
-# see if we can find > 0 images
-sleep ${RETRY_TIMER}
-check_for_download
-configure_images
+start_import
+if [[ $? -eq 0 ]]
+then
+    configure_images
+else
+    echo "Image import FAILED!"
+    exit 1
+fi
diff --git a/charts/maas/templates/job-export-api-key.yaml b/charts/maas/templates/job-export-api-key.yaml
index f1b2c73..64ccd86 100644
--- a/charts/maas/templates/job-export-api-key.yaml
+++ b/charts/maas/templates/job-export-api-key.yaml
@@ -65,6 +65,7 @@ rules:
       - get
       - create
       - update
+      - delete
     resources:
       - secrets
 ---
diff --git a/charts/maas/templates/job-import.yaml b/charts/maas/templates/job-import.yaml
index d78314a..eaba01a 100644
--- a/charts/maas/templates/job-import.yaml
+++ b/charts/maas/templates/job-import.yaml
@@ -52,6 +52,8 @@ spec:
                   key: USERNAME
             - name: RETRY_TIMER
               value: {{ .Values.jobs.import_boot_resources.retry_timer | quote }}
+            - name: TRY_LIMIT
+              value: {{ .Values.jobs.import_boot_resources.try_limit | quote }}
             - name: MAAS_ENDPOINT
               value: {{ tuple "maas_region_ui" "default" "region_ui" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}
             - name: MAAS_PROXY_ENABLED
diff --git a/charts/maas/values.yaml b/charts/maas/values.yaml
index 05b73f4..fa0f56f 100644
--- a/charts/maas/values.yaml
+++ b/charts/maas/values.yaml
@@ -81,6 +81,7 @@ images:
 
 jobs:
   import_boot_resources:
+    try_limit: 1
     retry_timer: 10
     #default timeout: 15 minutes
     timeout: 900