diff --git a/tripleo_common/image/image_uploader.py b/tripleo_common/image/image_uploader.py
index 2b4ae99e2..0f751dae8 100644
--- a/tripleo_common/image/image_uploader.py
+++ b/tripleo_common/image/image_uploader.py
@@ -657,6 +657,9 @@ class BaseImageUploader(object):
         created = config['created']
         docker_version = config.get('docker_version', '')
         labels = config['config'].get('Labels', {})
+        # NOTE: labels can be null
+        if labels is None:
+            labels = {}
         architecture = config['architecture']
         image_os = config['os']