diff --git a/environments/config-download-environment.yaml b/environments/config-download-environment.yaml
index 30ac4d6b25..e266465952 100644
--- a/environments/config-download-environment.yaml
+++ b/environments/config-download-environment.yaml
@@ -9,3 +9,7 @@ resource_registry:
 
   OS::TripleO::Ssh::KnownHostsDeployment: OS::Heat::None
   OS::TripleO::Ssh::HostPubKey: OS::Heat::None
+
+  # stable/queens fix to enable config-download for PreNetworkConfig
+  OS::TripleO::Services::BootParams: ../extraconfig/pre_network/boot-params-service.yaml
+  OS::TripleO::Reboot::SoftwareDeployment: OS::Heat::None
diff --git a/environments/disable-config-download-environment.yaml b/environments/disable-config-download-environment.yaml
deleted file mode 100644
index 283c17bb5f..0000000000
--- a/environments/disable-config-download-environment.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Deprecated as config-download is now the default.
-resource_registry:
-  OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
-  OS::TripleO::Ssh::HostPubKey: ../extraconfig/tasks/ssh/host_public_key.yaml
-  OS::TripleO::Ssh::KnownHostsDeployment: OS::Heat::StructuredDeployments
-  OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup
-
-  # Used only for config-download deployment, for non-config-download deployment,
-  # PreNetworkConfig (host-config-and-reboot.yaml) stack will handle it.
-  OS::TripleO::Services::BootParams: OS::Heat::None
-  OS::TripleO::Reboot::SoftwareDeployment: OS::TripleO::SoftwareDeployment
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index b7fcd550c8..c939b16433 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -14,7 +14,8 @@ resource_registry:
   # Tasks (for internal TripleO usage)
   OS::TripleO::Tasks::UpdateWorkflow: OS::Heat::None
   OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml
-  OS::TripleO::Reboot::SoftwareDeployment: OS::Heat::None
+  # stable/queens fix to enabled PreNetworkConfig via heat
+  OS::TripleO::Reboot::SoftwareDeployment: OS::TripleO::SoftwareDeployment
 
 {% for role in roles %}
   OS::TripleO::{{role.name}}::PreNetworkConfig: OS::Heat::None
@@ -355,7 +356,8 @@ resource_registry:
   OS::TripleO::Services::Logging::NovaPlacement: docker/services/logging/files/nova-placement.yaml
   OS::TripleO::Services::Logging::PankoApi: docker/services/logging/files/panko-api.yaml
 
-  OS::TripleO::Services::BootParams: extraconfig/pre_network/boot-params-service.yaml
+  # stable/queens fix to disable BootParams service (required for config-download)
+  OS::TripleO::Services::BootParams: OS::Heat::None
 
 parameter_defaults:
   EnablePackageInstall: false