diff --git a/environments/config-download-environment.yaml b/environments/config-download-environment.yaml
index 29e366ecf5..cd1b57e207 100644
--- a/environments/config-download-environment.yaml
+++ b/environments/config-download-environment.yaml
@@ -8,6 +8,7 @@ resource_registry:
   OS::Heat::StructuredDeployment: ../config-download-structured.yaml
 
   OS::TripleO::DeploymentSteps: OS::Heat::None
+  OS::TripleO::WorkflowSteps: OS::Heat::None
 
   OS::TripleO::Ssh::KnownHostsDeployment: OS::Heat::None
   OS::TripleO::Ssh::HostPubKey: OS::Heat::None
diff --git a/environments/lifecycle/ffwd-upgrade-converge.yaml b/environments/lifecycle/ffwd-upgrade-converge.yaml
index 5a45ae7230..c726530518 100644
--- a/environments/lifecycle/ffwd-upgrade-converge.yaml
+++ b/environments/lifecycle/ffwd-upgrade-converge.yaml
@@ -1,12 +1,6 @@
 # Environment file used in the last step of a ffwd overcloud upgrade.
 # This file is required by the tripleoclient and not expected to be updated
 # by the operator. Please use additional -e env.yaml.
-resource_registry:
-  OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
-  OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup
-  OS::TripleO::WorkflowSteps: OS::Mistral::ExternalResource
-  OS::Heat::SoftwareDeployment:  OS::TripleO::Heat::SoftwareDeployment
-  OS::Heat::StructuredDeployment: OS::TripleO::Heat::StructuredDeployment
 parameter_defaults:
   CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']
   UpgradeLevelNovaCompute: ''
diff --git a/environments/lifecycle/ffwd-upgrade-prepare.yaml b/environments/lifecycle/ffwd-upgrade-prepare.yaml
index 4203499217..470413cea9 100644
--- a/environments/lifecycle/ffwd-upgrade-prepare.yaml
+++ b/environments/lifecycle/ffwd-upgrade-prepare.yaml
@@ -5,14 +5,6 @@ resource_registry:
   OS::TripleO::Services::Core: OS::Heat::None
   OS::TripleO::Services::GlanceRegistry: OS::Heat::None
   OS::TripleO::Services::VipHosts: OS::Heat::None
-  # Set the config-download environment for the stack update:
-  OS::TripleO::SoftwareDeployment: ../../config-download-structured.yaml
-  OS::Heat::SoftwareDeployment: ../../config-download-software.yaml
-  OS::Heat::StructuredDeployment: ../../config-download-structured.yaml
-  OS::TripleO::DeploymentSteps: OS::Heat::None
-  OS::TripleO::WorkflowSteps: OS::Heat::None
-  OS::TripleO::Ssh::KnownHostsDeployment: OS::Heat::None
-  OS::TripleO::Ssh::HostPubKey: OS::Heat::None
   # Deprecated/Name changed services
   OS::TripleO::Services::FluentdClient: OS::Heat::None
 
diff --git a/environments/lifecycle/update-converge.yaml b/environments/lifecycle/update-converge.yaml
index 5871e65dd5..38a37c4b48 100644
--- a/environments/lifecycle/update-converge.yaml
+++ b/environments/lifecycle/update-converge.yaml
@@ -1,9 +1,6 @@
 # Environment file used in the last step of an overcloud update.
 # This file is required by the tripleoclient and not expected to be updated
 # by the operator. Please use additional -e env.yaml for customizations.
-resource_registry:
-  OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup
-  OS::TripleO::WorkflowSteps: OS::Mistral::ExternalResource
 parameter_defaults:
   CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']
   UpgradeLevelNovaCompute: ''
diff --git a/environments/lifecycle/update-prepare.yaml b/environments/lifecycle/update-prepare.yaml
index 6700b3405b..025f6d29ff 100644
--- a/environments/lifecycle/update-prepare.yaml
+++ b/environments/lifecycle/update-prepare.yaml
@@ -2,7 +2,5 @@
 # This file is required by the tripleoclient and not expected to be updated
 # by the operator. Please use additional -e env.yaml for customizations.
 resource_registry:
-  OS::TripleO::DeploymentSteps: OS::Heat::None
-  OS::TripleO::WorkflowSteps: OS::Heat::None
   OS::TripleO::Tasks::*PreConfig: OS::Heat::None
   OS::TripleO::Tasks::*PostConfig: OS::Heat::None
diff --git a/environments/lifecycle/upgrade-converge.yaml b/environments/lifecycle/upgrade-converge.yaml
index 388397c6ad..247ba0d90d 100644
--- a/environments/lifecycle/upgrade-converge.yaml
+++ b/environments/lifecycle/upgrade-converge.yaml
@@ -1,9 +1,6 @@
 # Environment file used in the last step of an overcloud upgrade.
 # This file is required by the tripleoclient and not expected to be updated
 # by the operator. Please use additional -e env.yaml.
-resource_registry:
-  OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup
-  OS::TripleO::WorkflowSteps: OS::Mistral::ExternalResource
 parameter_defaults:
   CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']
   UpgradeLevelNovaCompute: ''
diff --git a/environments/lifecycle/upgrade-prepare.yaml b/environments/lifecycle/upgrade-prepare.yaml
index a0ea2a2194..6ca124e74c 100644
--- a/environments/lifecycle/upgrade-prepare.yaml
+++ b/environments/lifecycle/upgrade-prepare.yaml
@@ -2,12 +2,8 @@
 # This file is required by the tripleoclient and not expected to be updated
 # by the operator. Please use additional -e env.yaml.
 resource_registry:
-  OS::TripleO::DeploymentSteps: OS::Heat::None
-  OS::TripleO::WorkflowSteps: OS::Heat::None
   OS::TripleO::Tasks::*PreConfig: OS::Heat::None
   OS::TripleO::Tasks::*PostConfig: OS::Heat::None
-  # Deprecated/Name changed services
-  OS::TripleO::Services::FluentdClient: OS::Heat::None
 
 parameter_defaults:
   UpgradeLevelNovaCompute: auto