diff --git a/tripleo_common/inventories.py b/tripleo_common/inventories.py
index 9c2e5bd13..b84f50953 100644
--- a/tripleo_common/inventories.py
+++ b/tripleo_common/inventories.py
@@ -16,7 +16,8 @@
 # under the License.
 
 from collections import OrderedDict
-import os.path
+import os
+import tempfile
 import yaml
 
 
@@ -137,8 +138,10 @@ class TripleoInventories(object):
                 if var in inventory:
                     inventory[var]['vars'].update(value)
 
-        with open(inventory_file_path, 'w') as inventory_file:
+        # Atomic update as concurrent tripleoclient commands can call this
+        with tempfile.NamedTemporaryFile('w', delete=False) as inventory_file:
             yaml.dump(inventory, inventory_file, TemplateDumper)
+        os.rename(inventory_file.name, inventory_file_path)
 
     def host(self):
         # Dynamic inventory scripts must return empty json if they don't
diff --git a/tripleo_common/inventory.py b/tripleo_common/inventory.py
index d5881ef5c..6785a47f4 100644
--- a/tripleo_common/inventory.py
+++ b/tripleo_common/inventory.py
@@ -17,8 +17,9 @@
 
 from collections import OrderedDict
 import logging
-import os.path
+import os
 import sys
+import tempfile
 import yaml
 
 from heatclient.exc import HTTPNotFound
@@ -383,5 +384,7 @@ class TripleoInventory(object):
                 if var in inventory:
                     inventory[var]['vars'].update(value)
 
-        with open(inventory_file_path, 'w') as inventory_file:
+        # Atomic update as concurrent tripleoclient commands can call this
+        with tempfile.NamedTemporaryFile('w', delete=False) as inventory_file:
             yaml.dump(inventory, inventory_file, TemplateDumper)
+        os.rename(inventory_file.name, inventory_file_path)