diff --git a/heat.yaml b/heat.yaml
index 770a648369..d6aa52ed32 100644
--- a/heat.yaml
+++ b/heat.yaml
@@ -95,6 +95,8 @@ Resources:
       ImageId:
         {Ref: HeatEngineImage}
     Metadata:
+      OpenStack::Role: stateful
+      OpenStack::ImageBuilder::Elements: [ heat-engine ]
       heat:
         rpc_backend: heat.openstack.common.rpc.impl_kombu
         rabbit: