diff --git a/hot/resource_group/resource_group.yaml b/hot/resource_group/resource_group.yaml
index 8fa25c3b..d2b07871 100644
--- a/hot/resource_group/resource_group.yaml
+++ b/hot/resource_group/resource_group.yaml
@@ -13,15 +13,15 @@ outputs:
   # value, for other resources the ID returned will be the uuid of the
   # actual resource
   resource1_id:
-    value: {get_attr: [random_group, resource.0]}
+    value: { get_attr: [random_group, resource.0] }
   resource2_id:
-    value: {get_attr: [random_group, resource.1]}
+    value: { get_attr: [random_group, resource.1] }
   # The last part of the resource.0.value specifies the attribute of the
   # nested resource to access, e.g in this case 'value'
   resource1_value:
-    value: {get_attr: [random_group, resource.0.value]}
+    value: { get_attr: [random_group, resource.0.value] }
   resource2_value:
-    value: {get_attr: [random_group, resource.1.value]}
+    value: { get_attr: [random_group, resource.1.value] }
   # You can also get a list of all values in the group
   all_values:
-    value: {get_attr: [random_group, value]}
+    value: { get_attr: [random_group, value] }
diff --git a/hot/resource_group/server_with_volumes.yaml b/hot/resource_group/server_with_volumes.yaml
index 1103b3c5..3aac8e78 100644
--- a/hot/resource_group/server_with_volumes.yaml
+++ b/hot/resource_group/server_with_volumes.yaml
@@ -19,14 +19,14 @@ parameters:
     description: Size of volume to attach to instance
     default: 1
     constraints:
-      - range: {min: 1, max: 10}
+      - range: { min: 1, max: 10 }
 
   num_volumes:
     type: number
     description: Number of volumes to attach to instance
     default: 2
     constraints:
-      - range: {min: 1, max: 10}
+      - range: { min: 1, max: 10 }
 
   instance_type:
     type: string
@@ -44,12 +44,12 @@ resources:
   group_of_volumes:
     type: OS::Heat::ResourceGroup
     properties:
-      count: {get_param: num_volumes}
+      count: { get_param: num_volumes }
       resource_def:
         type: volume_with_attachment.yaml
         properties:
-          instance_id: {get_resource: instance}
-          volume_size: {get_param: volume_size}
+          instance_id: { get_resource: instance }
+          volume_size: { get_param: volume_size }
 
 outputs:
   server_ip:
diff --git a/hot/resource_group/volume_with_attachment.yaml b/hot/resource_group/volume_with_attachment.yaml
index 28ae35b7..1a0ae3f2 100644
--- a/hot/resource_group/volume_with_attachment.yaml
+++ b/hot/resource_group/volume_with_attachment.yaml
@@ -6,7 +6,7 @@ parameters:
     description: Size of volume to attach to instance
     default: 1
     constraints:
-      - range: {min: 1, max: 10}
+      - range: { min: 1, max: 10 }
 
   instance_id:
     type: string
@@ -23,4 +23,4 @@ resources:
     type: OS::Cinder::VolumeAttachment
     properties:
       volume_id: { get_resource: volume }
-      instance_uuid: { get_param: instance_id}
+      instance_uuid: { get_param: instance_id }