diff --git a/image-yaml/overcloud-hardened-images-uefi-centos8.yaml b/image-yaml/overcloud-hardened-images-uefi-centos8.yaml
deleted file mode 100644
index bf9fa3977..000000000
--- a/image-yaml/overcloud-hardened-images-uefi-centos8.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-disk_images:
-  -
-    imagename: overcloud-hardened-uefi-full
-    type: qcow2
-    distro: centos
-    release: 8
-    elements:
-      - selinux-permissive
-      - interface-names
-    packages:
-      - kernel-modules-extra
-  -
-    imagename: ironic-python-agent
-    type: qcow2
-    distro: centos
-    release: 8
-    elements:
-      - selinux-permissive
-      - interface-names
diff --git a/image-yaml/overcloud-hardened-images-uefi-rhel8.yaml b/image-yaml/overcloud-hardened-images-uefi-rhel8.yaml
deleted file mode 100644
index 522536f92..000000000
--- a/image-yaml/overcloud-hardened-images-uefi-rhel8.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-disk_images:
-  -
-    imagename: overcloud-hardened-uefi-full
-    type: qcow2
-    distro: rhel
-    release: 8
-    elements:
-      - interface-names
-    packages:
-      - rhosp-release
-      - kernel-modules-extra
-  -
-    imagename: ironic-python-agent
-    type: qcow2
-    distro: rhel
-    release: 8
-    elements:
-      - selinux-permissive
-      - interface-names
diff --git a/image-yaml/overcloud-images-centos8.yaml b/image-yaml/overcloud-images-centos8.yaml
deleted file mode 100644
index 707148511..000000000
--- a/image-yaml/overcloud-images-centos8.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-disk_images:
-  -
-    imagename: overcloud-full
-    type: qcow2
-    distro: centos
-    release: 8
-    elements:
-      - selinux-permissive
-      - interface-names
-    packages:
-      - kernel-modules-extra
-    environment:
-      FS_TYPE: xfs
-    options:
-      - "--mkfs-options '-s size=4096'"
-  -
-    imagename: ironic-python-agent
-    type: qcow2
-    distro: centos
-    release: 8
-    elements:
-      - selinux-permissive
-      - interface-names
diff --git a/image-yaml/overcloud-images-ceph-centos8.yaml b/image-yaml/overcloud-images-ceph-centos8.yaml
deleted file mode 100644
index 1f144bd3b..000000000
--- a/image-yaml/overcloud-images-ceph-centos8.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-disk_images:
-  -
-    imagename: overcloud-ceph
-    type: qcow2
-    distro: centos
-    release: 8
-    elements:
-      - selinux-permissive
-      - interface-names
diff --git a/image-yaml/overcloud-images-ceph-rhel8.yaml b/image-yaml/overcloud-images-ceph-rhel8.yaml
deleted file mode 100644
index 0513650fd..000000000
--- a/image-yaml/overcloud-images-ceph-rhel8.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-disk_images:
-  -
-    imagename: overcloud-ceph
-    type: qcow2
-    distro: rhel
-    release: 8
-    elements:
-      - interface-names
-    packages:
-      - rhosp-release
diff --git a/image-yaml/overcloud-images-rhel8.yaml b/image-yaml/overcloud-images-rhel8.yaml
deleted file mode 100644
index a7879db41..000000000
--- a/image-yaml/overcloud-images-rhel8.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-disk_images:
-  -
-    imagename: overcloud-full
-    type: qcow2
-    distro: rhel
-    release: 8
-    elements:
-      - interface-names
-    packages:
-      - rhosp-release
-      - kernel-modules-extra
-    environment:
-      FS_TYPE: xfs
-    options:
-      - "--mkfs-options '-s size=4096'"
-  -
-    imagename: ironic-python-agent
-    type: qcow2
-    distro: rhel
-    release: 8
-    elements:
-      - selinux-permissive
-      - interface-names