diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py
index f0d0fef15..017c69571 100644
--- a/tripleoclient/v1/overcloud_deploy.py
+++ b/tripleoclient/v1/overcloud_deploy.py
@@ -381,6 +381,9 @@ class DeployOvercloud(command.Command):
                 env_files_tracker=env_files_tracker,
                 cleanup=(not parsed_args.no_cleanup))
 
+        # Copy the env_files to tmp folder for archiving
+        self._copy_env_files(env_files, tht_root)
+
         if parsed_args.limit:
             # check if skip list is defined while using --limit and throw a
             # warning if necessary
@@ -423,6 +426,24 @@ class DeployOvercloud(command.Command):
 
         self._unprovision_baremetal(parsed_args)
 
+    def _copy_env_files(self, files_dict, tht_root):
+        file_prefix = "file://"
+
+        for fullpath in files_dict.keys():
+
+            if not fullpath.startswith(file_prefix):
+                continue
+
+            path = fullpath[len(file_prefix):]
+
+            if path.startswith(tht_root):
+                continue
+
+            reloc_path = os.path.join(
+                tht_root,
+                "user-environments/{}".format(os.path.basename(path)))
+            utils.safe_write(reloc_path, files_dict[fullpath])
+
     def _try_overcloud_deploy_with_compat_yaml(self, tht_root, stack,
                                                stack_name, parameters,
                                                env_files, timeout,