diff --git a/image-yaml/overcloud-images.yaml b/image-yaml/overcloud-images.yaml
index c3a03125f..81d8e06fb 100644
--- a/image-yaml/overcloud-images.yaml
+++ b/image-yaml/overcloud-images.yaml
@@ -28,12 +28,7 @@ disk_images:
       - sos
       - ntp
       - device-mapper-multipath
-      - python-heat-agent-puppet
-      - python-heat-agent-hiera
-      - python-heat-agent-apply-config
-      - python-heat-agent-ansible
-      - python-heat-agent-docker-cmd
-      - python-heat-agent-json-file
+      - openstack-heat-agents
     options:
       - "--min-tmpfs 5"
     environment:
diff --git a/releasenotes/notes/openstack-heat-agents-31a1a2908745f3bc.yaml b/releasenotes/notes/openstack-heat-agents-31a1a2908745f3bc.yaml
new file mode 100644
index 000000000..769910f01
--- /dev/null
+++ b/releasenotes/notes/openstack-heat-agents-31a1a2908745f3bc.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - Use the openstack-heat-agents package to install all of the
+    python-heat-agent packages in the image, instead of having to specify each
+    individually.