diff --git a/_modules/runtest/tempest_sections/validation.py b/_modules/runtest/tempest_sections/validation.py
index c2b1c47..541243e 100644
--- a/_modules/runtest/tempest_sections/validation.py
+++ b/_modules/runtest/tempest_sections/validation.py
@@ -61,7 +61,7 @@
         if not image_name:
             return
 
-        image_map = {'TestCirros-0.3.5': 'cubswin:)', 'TestFedora-27-1.6': ''}
+        image_map = {'TestCirros-0.3.5': 'cubswin:)', 'TestCirros-0.4.0': 'gocubsgo', 'TestFedora-27-1.6': ''}
 
         return image_map.get(image_name)
 
@@ -72,7 +72,7 @@
         if not image_name:
             return
 
-        image_map = {'TestCirros-0.3.5': 'cirros', 'TestFedora-27-1.6': 'fedora'}
+        image_map = {'TestCirros-0.3.5': 'cirros', 'TestCirros-0.4.0': 'cirros', 'TestFedora-27-1.6': 'fedora'}
 
         return image_map.get(image_name)