diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index 843773644f..98f0607fe6 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -412,7 +412,6 @@
 # Whether Ironic will manage booting of the agent ramdisk. If
 # set to False, you will need to configure your mechanism to
 # allow booting the agent ramdisk. (boolean value)
-# Deprecated group/name - [agent]/manage_tftp
 #manage_agent_boot = true
 
 # The memory size in MiB consumed by agent when it is booted
diff --git a/ironic/drivers/modules/agent.py b/ironic/drivers/modules/agent.py
index e5e587f319..971bd63ed8 100644
--- a/ironic/drivers/modules/agent.py
+++ b/ironic/drivers/modules/agent.py
@@ -40,7 +40,6 @@ from ironic.drivers.modules import deploy_utils
 agent_opts = [
     cfg.BoolOpt('manage_agent_boot',
                 default=True,
-                deprecated_name='manage_tftp',
                 help=_('Whether Ironic will manage booting of the agent '
                        'ramdisk. If set to False, you will need to configure '
                        'your mechanism to allow booting the agent '
diff --git a/releasenotes/notes/remove-manage-tftp-0c2f4f417b92b1ee.yaml b/releasenotes/notes/remove-manage-tftp-0c2f4f417b92b1ee.yaml
new file mode 100644
index 0000000000..4e0e028df6
--- /dev/null
+++ b/releasenotes/notes/remove-manage-tftp-0c2f4f417b92b1ee.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - Removes deprecated option "[agent]/manage_tftp". Configuration
+    files should instead use the "[agent]/manage_agent_boot" option.