diff --git a/server/afe_utils.py b/server/afe_utils.py
index 7c62151..a4fa201 100644
--- a/server/afe_utils.py
+++ b/server/afe_utils.py
@@ -208,10 +208,8 @@
             *args, **dargs)
     else:
         image_name, host_attributes = host.machine_install(*args, **dargs)
-        info = host.host_info_store.get()
-        info.attributes.update(host_attributes)
-        host.host_info_store.commit(info)
 
     info = host.host_info_store.get()
+    info.attributes.update(host_attributes)
     info.set_version_label(host.VERSION_PREFIX, image_name)
     host.host_info_store.commit(info)