diff --git a/extraconfig/all_nodes/mac_hostname.j2.yaml b/extraconfig/all_nodes/mac_hostname.j2.yaml
index 3776b5d8c0..4e209fbac8 100644
--- a/extraconfig/all_nodes/mac_hostname.j2.yaml
+++ b/extraconfig/all_nodes/mac_hostname.j2.yaml
@@ -31,7 +31,7 @@ resources:
   # deployment instead of requiring one deployment per-role.
 {% for role in roles %}
   CollectMacDeployments{{role.name}}:
-    type: OS::Heat::SoftwareDeployments
+    type: OS::Heat::SoftwareDeploymentGroup
     properties:
       name: CollectMacDeploymentsController
       servers:  {get_param: [servers, {{role.name}}]}
@@ -60,7 +60,7 @@ resources:
         echo "mappings = $(cat /root/*_mappings)"
 
   DistributeMacDeploymentsController:
-    type: OS::Heat::SoftwareDeployments
+    type: OS::Heat::SoftwareDeploymentGroup
     properties:
       name: DistributeMacDeploymentsController
       servers:  {get_param: [servers, Controller]}
diff --git a/extraconfig/all_nodes/random_string.j2.yaml b/extraconfig/all_nodes/random_string.j2.yaml
index 4138fdf43b..0eab2ae0ca 100644
--- a/extraconfig/all_nodes/random_string.j2.yaml
+++ b/extraconfig/all_nodes/random_string.j2.yaml
@@ -31,7 +31,7 @@ resources:
         echo $random_value > /root/random_value
 
   RandomDeploymentsController:
-    type: OS::Heat::SoftwareDeployments
+    type: OS::Heat::SoftwareDeploymentGroup
     properties:
       name: RandomDeploymentsController
       servers:  {get_param: [servers, Controller]}
@@ -41,7 +41,7 @@ resources:
         random_value: {get_attr: [Random, value]}
 
   RandomDeploymentsCompute:
-    type: OS::Heat::SoftwareDeployments
+    type: OS::Heat::SoftwareDeploymentGroup
     properties:
       name: RandomDeploymentsCompute
       servers:  {get_param: [servers, Compute]}
diff --git a/extraconfig/post_deploy/example.yaml b/extraconfig/post_deploy/example.yaml
index 441ec413ab..99d7cc4253 100644
--- a/extraconfig/post_deploy/example.yaml
+++ b/extraconfig/post_deploy/example.yaml
@@ -20,7 +20,7 @@ resources:
         echo "extra" > /root/extra
 
   ExtraDeployments:
-    type: OS::Heat::SoftwareDeployments
+    type: OS::Heat::SoftwareDeploymentGroup
     properties:
       name: ExtraDeployments
       servers:  {get_param: servers}
diff --git a/extraconfig/post_deploy/example_run_on_update.yaml b/extraconfig/post_deploy/example_run_on_update.yaml
index dd317d2549..38efe9ae9e 100644
--- a/extraconfig/post_deploy/example_run_on_update.yaml
+++ b/extraconfig/post_deploy/example_run_on_update.yaml
@@ -31,7 +31,7 @@ resources:
         echo "extra_update $deploy_identifier" >> /root/extra_update
 
   ExtraDeployments:
-    type: OS::Heat::SoftwareDeployments
+    type: OS::Heat::SoftwareDeploymentGroup
     properties:
       name: ExtraDeployments
       servers:  {get_param: servers}
diff --git a/extraconfig/post_deploy/standalone_post.yaml b/extraconfig/post_deploy/standalone_post.yaml
index 876f5ebfe1..2a5b6278b7 100644
--- a/extraconfig/post_deploy/standalone_post.yaml
+++ b/extraconfig/post_deploy/standalone_post.yaml
@@ -59,7 +59,7 @@ resources:
                 force: yes
 
   StandalonePostDeployment:
-    type: OS::Heat::SoftwareDeployments
+    type: OS::Heat::SoftwareDeploymentGroup
     properties:
       name: StandalonePostDeployment
       servers: {get_param: servers}
@@ -83,7 +83,7 @@ resources:
       config: {get_file: ./clouds_yaml.py}
 
   CloudsYamlDeployment:
-    type: OS::Heat::SoftwareDeployments
+    type: OS::Heat::SoftwareDeploymentGroup
     properties:
       name: CloudsYamlDeployment
       servers: {get_param: servers}
diff --git a/extraconfig/post_deploy/undercloud_post.yaml b/extraconfig/post_deploy/undercloud_post.yaml
index 53648b6fb0..b64d0a21df 100644
--- a/extraconfig/post_deploy/undercloud_post.yaml
+++ b/extraconfig/post_deploy/undercloud_post.yaml
@@ -120,7 +120,7 @@ resources:
       config: {get_file: ./undercloud_post.sh}
 
   UndercloudPostDeployment:
-    type: OS::Heat::SoftwareDeployments
+    type: OS::Heat::SoftwareDeploymentGroup
     properties:
       name: UndercloudPostDeployment
       servers: {get_param: servers}
@@ -155,7 +155,7 @@ resources:
       config: {get_file: ./clouds_yaml.py}
 
   CloudsYamlDeployment:
-    type: OS::Heat::SoftwareDeployments
+    type: OS::Heat::SoftwareDeploymentGroup
     properties:
       name: CloudsYamlDeployment
       servers: {get_param: servers}
@@ -181,7 +181,7 @@ resources:
       config: {get_file: ./undercloud_post.py}
 
   UndercloudPostPyDeployment:
-    type: OS::Heat::SoftwareDeployments
+    type: OS::Heat::SoftwareDeploymentGroup
     depends_on: [UndercloudPostDeployment, CloudsYamlDeployment]
     properties:
       name: UndercloudPostPyDeployment
@@ -208,7 +208,7 @@ resources:
       config: {get_file: ./undercloud_ctlplane_network.py}
 
   UndercloudCtlplaneNetworkDeployment:
-    type: OS::Heat::SoftwareDeployments
+    type: OS::Heat::SoftwareDeploymentGroup
     depends_on: [UndercloudPostDeployment, CloudsYamlDeployment]
     properties:
       name: UndercloudCtlplaneNetworkDeployment
diff --git a/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.j2.yaml b/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.j2.yaml
index a8053d9a81..c2109a8f09 100644
--- a/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.j2.yaml
+++ b/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.j2.yaml
@@ -110,7 +110,7 @@ resources:
             neutron::plugins::ml2::cisco::type_nexus_vxlan::mcast_ranges: {get_input: NexusVxlanMcastRanges}
 
   NetworkCiscoDeployment:
-    type: OS::Heat::StructuredDeployments
+    type: OS::Heat::StructuredDeploymentGroup
     properties:
       name: NetworkCiscoDeployment
       config: {get_resource: NetworkCiscoConfig}
@@ -156,7 +156,7 @@ resources:
 
 {% for role in roles %}
   CollectMacDeployments{{role.name}}:
-    type: OS::Heat::SoftwareDeployments
+    type: OS::Heat::SoftwareDeploymentGroup
     properties:
       name: CollectMacDeployments{{role.name}}
       servers:  {get_param: [servers, {{role.name}}]}
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index d7643854a8..7cce590c94 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -244,8 +244,6 @@ VALIDATE_DOCKER_OVERRIDE = {
 DEPLOYMENT_RESOURCE_TYPES = [
     'OS::Heat::SoftwareDeploymentGroup',
     'OS::Heat::StructuredDeploymentGroup',
-    'OS::Heat::StructuredDeployments',
-    'OS::Heat::SoftwareDeployments',
     'OS::Heat::SoftwareDeployment',
     'OS::Heat::StructuredDeployment',
     'OS::TripleO::SoftwareDeployment'