diff --git a/nodepool/config.py b/nodepool/config.py
index b0e0f0be9..d27472804 100644
--- a/nodepool/config.py
+++ b/nodepool/config.py
@@ -348,7 +348,9 @@ class DiskImage(ConfigValue):
         keep_image_types = config.get('keep-formats', None)
         if keep_image_types:
             self.keep_image_types = set(keep_image_types)
-        self.delete_after_upload = config.get('delete-after-upload', False)
+        delete_after_upload = config.get('delete-after-upload', None)
+        if delete_after_upload is not None:
+            self.delete_after_upload = delete_after_upload
         pause = config.get('pause', None)
         if pause:
             self.pause = pause
diff --git a/nodepool/tests/fixtures/node_diskimage_cleanup_formats.yaml b/nodepool/tests/fixtures/node_diskimage_cleanup_formats.yaml
index f266774af..eb251bcec 100644
--- a/nodepool/tests/fixtures/node_diskimage_cleanup_formats.yaml
+++ b/nodepool/tests/fixtures/node_diskimage_cleanup_formats.yaml
@@ -61,10 +61,12 @@ providers:
             min-ram: 8192
 
 diskimages:
-  - name: fake-image
+  - name: parent
     delete-after-upload: true
     keep-formats:
       - qcow2
+  - name: fake-image
+    parent: parent
     elements:
       - fedora
       - vm