diff --git a/image-yaml/overcloud-hardened-images-centos7.yaml b/image-yaml/overcloud-hardened-images-centos7.yaml
deleted file mode 100644
index 7b2c7c138..000000000
--- a/image-yaml/overcloud-hardened-images-centos7.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-disk_images:
-  -
-    imagename: overcloud-hardened-full
-    type: qcow2
-    distro: centos7
-    elements:
-      - dhcp-all-interfaces
-      - selinux-permissive
-    packages:
-      - yum-plugin-priorities
diff --git a/image-yaml/overcloud-hardened-images-rhel7.yaml b/image-yaml/overcloud-hardened-images-rhel7.yaml
deleted file mode 100644
index 9f2aaecd1..000000000
--- a/image-yaml/overcloud-hardened-images-rhel7.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-disk_images:
-  -
-    imagename: overcloud-hardened-full
-    type: qcow2
-    distro: rhel
-    elements:
-      - dhcp-all-interfaces
-    environment:
-      DIB_RELEASE: '7'
diff --git a/image-yaml/overcloud-hardened-images-uefi-centos7.yaml b/image-yaml/overcloud-hardened-images-uefi-centos7.yaml
deleted file mode 100644
index a610e3560..000000000
--- a/image-yaml/overcloud-hardened-images-uefi-centos7.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-disk_images:
-  -
-    imagename: overcloud-hardened-uefi-full
-    type: qcow2
-    distro: centos7
-    elements:
-      - dhcp-all-interfaces
-      - selinux-permissive
-    packages:
-      - yum-plugin-priorities
diff --git a/image-yaml/overcloud-hardened-images-uefi-rhel7.yaml b/image-yaml/overcloud-hardened-images-uefi-rhel7.yaml
deleted file mode 100644
index 1c06b543d..000000000
--- a/image-yaml/overcloud-hardened-images-uefi-rhel7.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-disk_images:
-  -
-    imagename: overcloud-hardened-uefi-full
-    type: qcow2
-    distro: rhel
-    elements:
-      - dhcp-all-interfaces
-    environment:
-      DIB_RELEASE: '7'
-
diff --git a/image-yaml/overcloud-images-centos7.yaml b/image-yaml/overcloud-images-centos7.yaml
deleted file mode 100644
index 90915402a..000000000
--- a/image-yaml/overcloud-images-centos7.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-disk_images:
-  -
-    imagename: overcloud-full
-    type: qcow2
-    distro: centos7
-    elements:
-      - selinux-permissive
-    environment:
-      FS_TYPE: xfs
-    packages:
-      - yum-plugin-priorities
-    options:
-      - "--mkfs-options '-s size=4096'"
-  -
-    imagename: ironic-python-agent
-    type: qcow2
-    distro: centos7
-    elements:
-      - dhcp-all-interfaces
-      - selinux-permissive
-    packages:
-      - yum-plugin-priorities
-
diff --git a/image-yaml/overcloud-images-rhel7.yaml b/image-yaml/overcloud-images-rhel7.yaml
deleted file mode 100644
index e34d539aa..000000000
--- a/image-yaml/overcloud-images-rhel7.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-disk_images:
-  -
-    imagename: overcloud-full
-    type: qcow2
-    distro: rhel7
-    elements:
-      - dhcp-all-interfaces
-    environment:
-      FS_TYPE: xfs
-    options:
-      - "--mkfs-options '-s size=4096'"
-  -
-    imagename: ironic-python-agent
-    type: qcow2
-    distro: rhel7
diff --git a/image-yaml/overcloud-realtime-compute-centos7.yaml b/image-yaml/overcloud-realtime-compute-centos7.yaml
deleted file mode 100644
index a9d99ec2c..000000000
--- a/image-yaml/overcloud-realtime-compute-centos7.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-disk_images:
-  -
-    imagename: overcloud-realtime-compute
-    type: qcow2
-    distro: centos7
-    elements:
-      - dhcp-all-interfaces
-      - selinux-permissive
-    packages:
-      - yum-plugin-priorities
diff --git a/image-yaml/overcloud-realtime-compute-rhel7.yaml b/image-yaml/overcloud-realtime-compute-rhel7.yaml
deleted file mode 100644
index c2b8432b4..000000000
--- a/image-yaml/overcloud-realtime-compute-rhel7.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-disk_images:
-  -
-    imagename: overcloud-realtime-compute
-    type: qcow2
-    distro: rhel7
-    elements:
-      - dhcp-all-interfaces