diff --git a/environments/host-config-and-reboot.j2.yaml b/environments/host-config-and-reboot.j2.yaml
deleted file mode 100644
index de4f8f6573..0000000000
--- a/environments/host-config-and-reboot.j2.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-## DEPRECATED
-# KernelArgs and TunedProfileName has been moved from PreNetworkConfig to boot-params-service.yaml (TripleO service)
-# OvS-DPDK configurations has been moved from PreNetworkConfig to respective dpdk TripleO service (ml2-ovs, ml2-ovn)
-# host_config_and_reboot.yaml does not do anything, and soon it will be removed
-
-resource_registry:
-{% for role in roles %}
-  OS::TripleO::{{role.name}}::PreNetworkConfig: OS::Heat::None
-{% endfor %}
-
-#parameter_defaults:
-  # Note: There are no global parameters which can be applied to all roles as
-  # these configuration have to be specific to role.
-
-  # Sample parameters for Compute and ComputeOvsDpdk roles
-  #ComputeParameters:
-    #KernelArgs: ""
-    #TunedProfileName: ""
-    #IsolCpusList: ""
-  #ComputeOvsDpdkParameters:
-    #KernelArgs: "intel_iommu=on iommu=pt default_hugepagesz=1GB hugepagesz=1G hugepages=60"
-    #TunedProfileName: "cpu-partitioning"
-    #IsolCpusList: ""
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 99f83ec7bf..fd87dbf63f 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -10,7 +10,6 @@ resource_registry:
   OS::TripleO::RandomString: OS::Heat::RandomString
 
 {% for role in roles %}
-  OS::TripleO::{{role.name}}::PreNetworkConfig: OS::Heat::None
   OS::TripleO::{{role.name}}PostDeploySteps: common/post.yaml
   OS::TripleO::{{role.name}}: puppet/{{role.name.lower()}}-role.yaml
   OS::TripleO::Tasks::{{role.name}}PreConfig: OS::Heat::None
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index e42c195c40..9b2774a4da 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -531,17 +531,8 @@ resources:
           short:
             - {get_attr: [{{server_resource_name}}, name]}
 
-  PreNetworkConfig:
-    type: OS::TripleO::{{role.name}}::PreNetworkConfig
-    properties:
-      server: {get_resource: {{server_resource_name}}}
-      RoleParameters: {get_param: RoleParameters}
-      ServiceNames: {get_param: ServiceNames}
-      deployment_actions: {get_attr: [DeploymentActions, value]}
-
   # Resource for site-specific injection of root certificate
   NodeTLSCAData:
-    depends_on: PreNetworkConfig
     type: OS::TripleO::NodeTLSCAData
     properties:
       server: {get_resource: {{server_resource_name}}}
diff --git a/releasenotes/notes/remove_pre_network-fb38d9c2095e0597.yaml b/releasenotes/notes/remove_pre_network-fb38d9c2095e0597.yaml
new file mode 100644
index 0000000000..70584e4750
--- /dev/null
+++ b/releasenotes/notes/remove_pre_network-fb38d9c2095e0597.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Environment file host-config-and-reboot.yaml has been removed and the
+    required functionality is part of BootParams service.