diff --git a/orm/services/resource_distributor/rds/services/yaml_image_builder.py b/orm/services/resource_distributor/rds/services/yaml_image_builder.py
index 6bfe48eb..4888252c 100755
--- a/orm/services/resource_distributor/rds/services/yaml_image_builder.py
+++ b/orm/services/resource_distributor/rds/services/yaml_image_builder.py
@@ -42,7 +42,7 @@ def _properties(alldata, region):
 
 def _glanceimage(alldata, region):
     return dict(
-        type="OS::Glance::Image",
+        type="OS::Glance::Image2",
         properties=_properties(alldata, region)
     )
 
diff --git a/orm/tests/unit/rds/services/test_image_yaml.py b/orm/tests/unit/rds/services/test_image_yaml.py
index 08959ea3..951eefcf 100755
--- a/orm/tests/unit/rds/services/test_image_yaml.py
+++ b/orm/tests/unit/rds/services/test_image_yaml.py
@@ -55,7 +55,7 @@ yaml_output = {
                     'image_internal_id': 1
                 }
             },
-            'type': 'OS::Glance::Image'
+            'type': 'OS::Glance::Image2'
         }
     },
     'heat_template_version': '2015-1-1',