diff --git a/image-yaml/overcloud-hardened-images-centos8.yaml b/image-yaml/overcloud-hardened-images-centos8.yaml
deleted file mode 100644
index e9fdbd0b4..000000000
--- a/image-yaml/overcloud-hardened-images-centos8.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-disk_images:
-  -
-    imagename: overcloud-hardened-full
-    type: qcow2
-    distro: centos
-    environment:
-      DIB_RELEASE: '8'
-    elements:
-      - selinux-permissive
-      - interface-names
-    packages:
-      - kernel-modules-extra
diff --git a/image-yaml/overcloud-hardened-images-python3-rt-kernel.yaml b/image-yaml/overcloud-hardened-images-python3-rt-kernel.yaml
deleted file mode 100644
index 17af288a5..000000000
--- a/image-yaml/overcloud-hardened-images-python3-rt-kernel.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-disk_images:
-  -
-    imagename: overcloud-hardened-full-rt-kernel
-    type: qcow2
-    elements:
-      - openvswitch
-      - overcloud-agent
-      - overcloud-base
-      - overcloud-controller
-      - overcloud-compute
-      - overcloud-ceph-storage
-      - puppet-modules
-      - stable-interface-names
-      - bootloader
-      - element-manifest
-      - dynamic-login
-      - iptables
-      - enable-packages-install
-      - override-pip-and-virtualenv
-      - dracut-regenerate
-      - remove-machine-id
-      - remove-resolvconf
-      - modprobe
-      - overcloud-partition
-      - openssh
-      - disable-nouveau
-    packages:
-      - kernel-rt
-      - python3-psutil
-      - python3-debtcollector
-      - sos
-      - device-mapper-multipath
-      - openstack-heat-agents
-      - os-net-config
-      - jq
-    options:
-      - "--min-tmpfs=7"
-    environment:
-      DIB_PYTHON_VERSION: '3'
-      DIB_MODPROBE_BLACKLIST: 'usb-storage cramfs freevxfs jffs2 hfs hfsplus squashfs udf vfat bluetooth'
-      DIB_BOOTLOADER_DEFAULT_CMDLINE: 'nofb nomodeset vga=normal console=tty0 console=ttyS0,115200 audit=1 nousb'
-      DIB_IMAGE_SIZE: '40'
-      COMPRESS_IMAGE: '1'
diff --git a/image-yaml/overcloud-hardened-images-rhel8.yaml b/image-yaml/overcloud-hardened-images-rhel8.yaml
deleted file mode 100644
index f3d6547fb..000000000
--- a/image-yaml/overcloud-hardened-images-rhel8.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-disk_images:
-  -
-    imagename: overcloud-hardened-full
-    type: qcow2
-    distro: rhel
-    environment:
-      DIB_RELEASE: '8'
-    elements:
-      - interface-names
-    packages:
-      - rhosp-release
-      - kernel-modules-extra
diff --git a/image-yaml/overcloud-hardened-images-python3.yaml b/image-yaml/overcloud-hardened-images-uefi-python3-rt-kernel.yaml
similarity index 83%
rename from image-yaml/overcloud-hardened-images-python3.yaml
rename to image-yaml/overcloud-hardened-images-uefi-python3-rt-kernel.yaml
index fbe7fd42e..89570ee63 100644
--- a/image-yaml/overcloud-hardened-images-python3.yaml
+++ b/image-yaml/overcloud-hardened-images-uefi-python3-rt-kernel.yaml
@@ -1,6 +1,6 @@
 disk_images:
   -
-    imagename: overcloud-hardened-full
+    imagename: overcloud-hardened-uefi-full-rt-kernel
     type: qcow2
     elements:
       - openvswitch
@@ -21,11 +21,12 @@ disk_images:
       - remove-machine-id
       - remove-resolvconf
       - modprobe
-      - overcloud-partition
+      - overcloud-partition-uefi
       - overcloud-secure
       - openssh
       - disable-nouveau
     packages:
+      - kernel-rt
       - python3-psutil
       - python3-debtcollector
       - sos
@@ -37,7 +38,8 @@ disk_images:
       - "--min-tmpfs=7"
     environment:
       DIB_PYTHON_VERSION: '3'
-      DIB_MODPROBE_BLACKLIST: 'usb-storage cramfs freevxfs jffs2 hfs hfsplus squashfs udf vfat bluetooth'
+      DIB_MODPROBE_BLACKLIST: 'usb-storage cramfs freevxfs jffs2 hfs hfsplus squashfs udf bluetooth'
       DIB_BOOTLOADER_DEFAULT_CMDLINE: 'nofb nomodeset vga=normal console=tty0 console=ttyS0,115200 audit=1 nousb'
-      DIB_IMAGE_SIZE: '40'
+      DIB_IMAGE_SIZE: '6'
       COMPRESS_IMAGE: '1'
+      DIB_BLOCK_DEVICE: 'efi'
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 8c99ce79f..08f5af29a 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -32,8 +32,6 @@
             dependencies: *deps_unit_lint
         - tripleo-buildimage-ironic-python-agent-centos-8:
             dependencies: *deps_unit_lint
-        - tripleo-buildimage-overcloud-hardened-full-centos-8:
-            dependencies: *deps_unit_lint
         - tripleo-buildimage-overcloud-hardened-uefi-full-centos-8:
             dependencies: *deps_unit_lint