diff --git a/charts/maas/templates/bin/_import-boot-resources.sh.tpl b/charts/maas/templates/bin/_import-boot-resources.sh.tpl
index 84a7d32..a631c64 100644
--- a/charts/maas/templates/bin/_import-boot-resources.sh.tpl
+++ b/charts/maas/templates/bin/_import-boot-resources.sh.tpl
@@ -27,7 +27,7 @@ function check_for_download {
         else
             echo 'Boot resources have completed importing'
             # TODO(sthussey) Need to check synced images exist - could be a import failure
-            exit 0
+            return 0
         fi
     done
     exit 1
@@ -50,6 +50,13 @@ function configure_dns {
   maas ${ADMIN_USERNAME} maas set-config name=upstream_dns value=${MAAS_DNS_SERVERS}
 }
 
+function configure_images {
+  maas ${ADMIN_USERNAME} maas set-config name=default_osystem value=${MAAS_DEFAULT_OS}
+  maas ${ADMIN_USERNAME} maas set-config name=commissioning_distro_series value=${MAAS_DEFAULT_DISTRO}
+  maas ${ADMIN_USERNAME} maas set-config name=default_distro_series value=${MAAS_DEFAULT_DISTRO}
+  maas ${ADMIN_USERNAME} maas set-config name=default_min_hwe_kernel value=${MAAS_DEFAULT_KERNEL}
+}
+
 function configure_boot_sources {
   if [[ $USE_IMAGE_CACHE == 'true' ]]
   then
@@ -71,3 +78,4 @@ maas ${ADMIN_USERNAME} boot-resources import
 # see if we can find > 0 images
 sleep ${RETRY_TIMER}
 check_for_download
+configure_images
diff --git a/charts/maas/templates/job-import.yaml b/charts/maas/templates/job-import.yaml
index ff3d960..d78314a 100644
--- a/charts/maas/templates/job-import.yaml
+++ b/charts/maas/templates/job-import.yaml
@@ -70,6 +70,12 @@ spec:
               value: {{ .Values.conf.maas.dns.require_dnssec | quote }}
             - name: MAAS_DNS_SERVERS
               value: {{ .Values.conf.maas.dns.dns_servers }}
+            - name: MAAS_DEFAULT_OS
+              value: {{ .Values.conf.maas.images.default_os | quote }}
+            - name: MAAS_DEFAULT_DISTRO
+              value: {{ .Values.conf.maas.images.default_image | quote }}
+            - name: MAAS_DEFAULT_KERNEL
+              value: {{ .Values.conf.maas.images.default_kernel | quote }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.import_resources | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/import-boot-resources.sh
diff --git a/charts/maas/values.yaml b/charts/maas/values.yaml
index 22cf6e6..5e00650 100644
--- a/charts/maas/values.yaml
+++ b/charts/maas/values.yaml
@@ -147,6 +147,10 @@ conf:
       database_name: maasdb
       database_user: maas
       database_password: password
+    images:
+      default_os: 'ubuntu'
+      default_image: 'xenial'
+      default_kernel: 'ga-16.04'
     credentials:
       secret:
         namespace: maas