diff --git a/kolla/image/build.py b/kolla/image/build.py
index 8db696dab8..0493ac5777 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -1019,6 +1019,10 @@ class KollaWorker(object):
                     'name': name,
                     'status': status,
                 })
+                if self.conf.logs_dir and status == STATUS_ERROR:
+                    os.symlink("%s.log" % name,
+                               os.path.join(self.conf.logs_dir,
+                                            "000_FAILED_%s.log" % name))
 
         if self.image_statuses_unmatched:
             LOG.debug("=====================================")
diff --git a/tests/playbooks/post.yml b/tests/playbooks/post.yml
index 8f37351114..aecb3d3dca 100644
--- a/tests/playbooks/post.yml
+++ b/tests/playbooks/post.yml
@@ -64,6 +64,12 @@
               sudo mv $f ${f/.log/.txt}
           done
 
+          # Update symlinks to new file names
+          for f in $(find logs -name "*FAILED*"); do
+              sudo mv ${f} ${f}.gz
+              sudo ln -sf ${f#*/000_FAILED_}.gz ${f}.gz
+          done
+
           # append .txt to all kolla config file
           find logs/kolla_configs -type f -exec mv '{}' '{}'.txt \;