diff --git a/image-yaml/overcloud-hardened-images-uefi-centos8.yaml b/image-yaml/overcloud-hardened-images-uefi-centos8.yaml
index be42f5135..7d3840a48 100644
--- a/image-yaml/overcloud-hardened-images-uefi-centos8.yaml
+++ b/image-yaml/overcloud-hardened-images-uefi-centos8.yaml
@@ -3,8 +3,15 @@ disk_images:
     imagename: overcloud-hardened-uefi-full
     type: qcow2
     distro: centos
-    environment:
-      DIB_RELEASE: '8'
+    release: 8
     elements:
       - selinux-permissive
       - interface-names
+  -
+    imagename: ironic-python-agent
+    type: qcow2
+    distro: centos
+    release: 8
+    elements:
+      - selinux-permissive
+      - interface-names
\ No newline at end of file
diff --git a/image-yaml/overcloud-hardened-images-uefi-python3.yaml b/image-yaml/overcloud-hardened-images-uefi-python3.yaml
index 6fc4343f5..3fac65a6f 100644
--- a/image-yaml/overcloud-hardened-images-uefi-python3.yaml
+++ b/image-yaml/overcloud-hardened-images-uefi-python3.yaml
@@ -42,3 +42,24 @@ disk_images:
       DIB_IMAGE_SIZE: '40'
       COMPRESS_IMAGE: '1'
       DIB_BLOCK_DEVICE: 'efi'
+  -
+    imagename: ironic-python-agent
+    # This is bogus, but there's no initrd type in diskimage-builder
+    type: qcow2
+    # So we just override the extension instead
+    imageext: initramfs
+    elements:
+      - ironic-python-agent-ramdisk
+      - ironic-agent-multipath
+      - dynamic-login
+      - element-manifest
+      - network-gateway
+      - enable-packages-install
+      - override-pip-and-virtualenv
+      - extra-hardware
+    options:
+      - "--min-tmpfs=7"
+    environment:
+      DIB_EPEL_DISABLED: '1'
+      DIB_PYTHON_VERSION: '3'
+      DIB_DHCP_TIMEOUT: '60'
diff --git a/image-yaml/overcloud-hardened-images-uefi-rhel8.yaml b/image-yaml/overcloud-hardened-images-uefi-rhel8.yaml
index 2d243c835..4b21a131b 100644
--- a/image-yaml/overcloud-hardened-images-uefi-rhel8.yaml
+++ b/image-yaml/overcloud-hardened-images-uefi-rhel8.yaml
@@ -3,9 +3,16 @@ disk_images:
     imagename: overcloud-hardened-uefi-full
     type: qcow2
     distro: rhel
-    environment:
-      DIB_RELEASE: '8'
+    release: 8
     elements:
       - interface-names
     packages:
       - rhosp-release
+  -
+    imagename: ironic-python-agent
+    type: qcow2
+    distro: rhel
+    release: 8
+    elements:
+      - selinux-permissive
+      - interface-names
\ No newline at end of file