diff --git a/extraconfig/pre_network/host_config_and_reboot.yaml b/extraconfig/pre_network/host_config_and_reboot.yaml
index 5ccc3caf03..43c58ef525 100644
--- a/extraconfig/pre_network/host_config_and_reboot.yaml
+++ b/extraconfig/pre_network/host_config_and_reboot.yaml
@@ -1,3 +1,7 @@
+# DEPRECATED: The following template is deprecated in Queens in favor of
+# extraconfig/pre_network/boot-params-service.yaml. This template does not work
+# with config-download and will be removed during the Stein release.
+
 heat_template_version: rocky
 
 description: >
diff --git a/extraconfig/tasks/ssh/host_public_key.yaml b/extraconfig/tasks/ssh/host_public_key.yaml
index 53ec5528d8..0539db4b5a 100644
--- a/extraconfig/tasks/ssh/host_public_key.yaml
+++ b/extraconfig/tasks/ssh/host_public_key.yaml
@@ -1,3 +1,8 @@
+# DEPRECATED: The following template is deprecated in Queens in favor of the
+# tripleo-ssh-known-hosts from tripleo-common. This template does not work with
+# config-download and will be removed from tripleo-heat-templates in the Stein
+# release.
+
 heat_template_version: rocky
 
 description: >
diff --git a/releasenotes/notes/deprecate-non-config-download-templates-3971fbf85b93846d.yaml b/releasenotes/notes/deprecate-non-config-download-templates-3971fbf85b93846d.yaml
new file mode 100644
index 0000000000..6009232850
--- /dev/null
+++ b/releasenotes/notes/deprecate-non-config-download-templates-3971fbf85b93846d.yaml
@@ -0,0 +1,7 @@
+---
+deprecations:
+  - The templates at extraconfig/pre_network/host_config_and_reboot.yaml
+    (replaced with extraconfig/pre_network/boot-params-service.yaml) and
+    extraconfig/tasks/ssh/host_public_key.yaml (replaced with the
+    tripleo-ssh-known-hosts role) are deprecated as they do not
+    work with config-download. They will be removed in the Stein release.