diff --git a/README.rst b/README.rst
index efa5ac590..32a6e616c 100644
--- a/README.rst
+++ b/README.rst
@@ -165,9 +165,7 @@ in a stand-alone fashion.
   chain-loading to iPXE, which then fetches the ironic-python-agent ramdisk
   from Nginx.
 * Deployments are performed by the Ironic Python Agent, which as configured
-  supports IPMI, iLO, and UCS drivers.  AMT driver support is also enabled,
-  however it should only be used for testing as due to a known bug which
-  can be read about at https://bugs.launchpad.net/ironic/+bug/1454492.
+  supports IPMI, iLO, and UCS drivers.
 * By default, installation will build an Ubuntu-based image for deployment
   to nodes.  This image can be easily customized if so desired.
 
@@ -512,7 +510,6 @@ Default Mode
 When not in testing mode, bifrost enables the following ironic drivers:
 
 * agent_ipmitool
-* pxe_amt
 * agent_ilo
 * agent_ucs
 
diff --git a/playbooks/roles/bifrost-ironic-install/README.md b/playbooks/roles/bifrost-ironic-install/README.md
index 7551f35a0..8c05fbe0f 100644
--- a/playbooks/roles/bifrost-ironic-install/README.md
+++ b/playbooks/roles/bifrost-ironic-install/README.md
@@ -86,7 +86,7 @@ extra_kernel_options: Default undefined.
 
 When testing, the default ironic conductor driver is "agent_ssh". When
 testing mode has not been engaged, drivers can be set via the enabled_drivers
-variable which defaults to: "agent_ipmitool,pxe_amt,agent_ilo,agent_ucs"
+variable which defaults to: "agent_ipmitool,agent_ilo,agent_ucs"
 
 By default, PXE driver baseline support, in terms of installation of the
 iSCSI client and configuration of sudoers and rootwrap configuration is
diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml
index 11966ee17..0697144e8 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml
@@ -152,7 +152,7 @@ download_ipxe: false
 enable_pxe_drivers: true
 # Comma-separated list of PXE drivers to enable when
 # enable_pxe_drivers is set to true
-pxe_drivers: "pxe_amt,pxe_ssh,pxe_ipmitool,pxe_ilo"
+pxe_drivers: "pxe_ssh,pxe_ipmitool,pxe_ilo"
 
 # Settings related to installing bifrost in a virtual environment
 enable_venv: false
diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml
index 5d8e0f3c9..571838b95 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml
@@ -36,7 +36,6 @@ required_packages:
   - kpartx
   - qemu-utils
   - python-openwsman
-  - amtterm
   - sgabios
   - libvirt-bin
   - debootstrap
diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_jessie.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_jessie.yml
index efe3cc16c..f779f3043 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_jessie.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_jessie.yml
@@ -34,7 +34,6 @@ required_packages:
   - genisoimage
   - kpartx
   - qemu-utils
-  - amtterm
   - sgabios
   - libvirt-bin
   - debootstrap
diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml
index 1a9729a30..9f3000aad 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml
@@ -40,7 +40,6 @@ required_packages:
   - sgabios-bin
   - libselinux-python
   - policycoreutils-python
-# NOTE(cinerama): amtterm is not currently packaged for RHEL/CentOS 7.
   - libvirt-daemon
   - debootstrap
   - gcc
diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Suse_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Suse_family.yml
index 101da4aa2..c22529265 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Suse_family.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Suse_family.yml
@@ -43,7 +43,6 @@ required_packages:
   - openwsman-python
   - qemu-sgabios
   - policycoreutils-python
-# NOTE(cinerama): amtterm is not currently packaged for SuSE.
   - libvirt-daemon
   - debootstrap
   - iptables
diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_16.04.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_16.04.yml
index e1dd91989..024bc30c5 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_16.04.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_16.04.yml
@@ -27,7 +27,6 @@ required_packages:
   - kpartx
   - qemu-utils
   - python-openwsman
-  - amtterm
   - sgabios
   - libvirt-bin
   - debootstrap
diff --git a/releasenotes/notes/drop-amt-e4bfb6e2ae3c4301.yaml b/releasenotes/notes/drop-amt-e4bfb6e2ae3c4301.yaml
new file mode 100644
index 000000000..51160c775
--- /dev/null
+++ b/releasenotes/notes/drop-amt-e4bfb6e2ae3c4301.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    bifrost no longer supports installing ironic AMT drivers when PXE drivers
+    are enabled (which is the default) due to AMT drivers have been removed
+    from ironic in Ocata release.