diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 596723c9fa4..dd8c75a1237 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -1964,7 +1964,7 @@ CREATE VIEW `cloud`.`template_view` AS
             left join
         `cloud`.`vm_template` source_template ON source_template.id = vm_template.source_template_id    
             left join
-        `cloud`.`template_store_ref` ON template_store_ref.template_id = vm_template.id
+        `cloud`.`template_store_ref` ON template_store_ref.template_id = vm_template.id and template_store_ref.store_role = 'Image'
             left join
         `cloud`.`image_store` ON image_store.removed is NULL AND template_store_ref.store_id is not NULL AND image_store.id = template_store_ref.store_id 
         	left join