From b534e2b64da9051808e6383fe8ca83dbd1521b95 Mon Sep 17 00:00:00 2001
From: Sanne Raymaekers <sanne.raymaekers@gmail.com>
Date: Wed, 17 Jul 2024 14:51:41 +0200
Subject: [PATCH] remove old rhel nightlies

---
 aws/rhel-8.10-nightly-aarch64/config.json     |  5 --
 aws/rhel-8.10-nightly-aarch64/main.tf         | 60 -------------------
 aws/rhel-8.10-nightly-x86_64/config.json      |  5 --
 aws/rhel-8.10-nightly-x86_64/main.tf          | 60 -------------------
 aws/rhel-8.9-nightly-aarch64/config.json      |  5 --
 aws/rhel-8.9-nightly-aarch64/main.tf          | 60 -------------------
 aws/rhel-8.9-nightly-x86_64/config.json       |  5 --
 aws/rhel-8.9-nightly-x86_64/main.tf           | 60 -------------------
 aws/rhel-9.3-nightly-aarch64/config.json      |  5 --
 aws/rhel-9.3-nightly-aarch64/main.tf          | 60 -------------------
 aws/rhel-9.3-nightly-x86_64/config.json       |  5 --
 aws/rhel-9.3-nightly-x86_64/main.tf           | 60 -------------------
 aws/rhel-9.4-nightly-aarch64/config.json      |  5 --
 aws/rhel-9.4-nightly-aarch64/main.tf          | 60 -------------------
 aws/rhel-9.4-nightly-x86_64/config.json       |  5 --
 aws/rhel-9.4-nightly-x86_64/main.tf           | 60 -------------------
 gcp/rhel-8.10-nightly-x86_64/config.json      |  5 --
 gcp/rhel-8.10-nightly-x86_64/main.tf          | 16 -----
 gcp/rhel-8.9-nightly-x86_64/config.json       |  5 --
 gcp/rhel-8.9-nightly-x86_64/main.tf           | 16 -----
 gcp/rhel-9.3-nightly-x86_64/config.json       |  5 --
 gcp/rhel-9.3-nightly-x86_64/main.tf           | 16 -----
 gcp/rhel-9.4-nightly-x86_64/config.json       |  5 --
 gcp/rhel-9.4-nightly-x86_64/main.tf           | 16 -----
 .../config.json                               |  5 --
 .../rhel-8.10-nightly-x86_64-large/main.tf    | 11 ----
 rhos-01/rhel-8.10-nightly-x86_64/config.json  |  5 --
 rhos-01/rhel-8.10-nightly-x86_64/main.tf      | 11 ----
 .../rhel-8.9-nightly-x86_64-large/config.json |  5 --
 rhos-01/rhel-8.9-nightly-x86_64-large/main.tf | 11 ----
 rhos-01/rhel-8.9-nightly-x86_64/config.json   |  5 --
 rhos-01/rhel-8.9-nightly-x86_64/main.tf       | 11 ----
 .../rhel-9.3-nightly-x86_64-large/config.json |  5 --
 rhos-01/rhel-9.3-nightly-x86_64-large/main.tf | 11 ----
 rhos-01/rhel-9.3-nightly-x86_64/config.json   |  5 --
 rhos-01/rhel-9.3-nightly-x86_64/main.tf       | 11 ----
 .../rhel-9.4-nightly-x86_64-large/config.json |  5 --
 rhos-01/rhel-9.4-nightly-x86_64-large/main.tf | 11 ----
 rhos-01/rhel-9.4-nightly-x86_64/config.json   |  5 --
 rhos-01/rhel-9.4-nightly-x86_64/main.tf       | 11 ----
 40 files changed, 732 deletions(-)
 delete mode 100644 aws/rhel-8.10-nightly-aarch64/config.json
 delete mode 100644 aws/rhel-8.10-nightly-aarch64/main.tf
 delete mode 100644 aws/rhel-8.10-nightly-x86_64/config.json
 delete mode 100644 aws/rhel-8.10-nightly-x86_64/main.tf
 delete mode 100644 aws/rhel-8.9-nightly-aarch64/config.json
 delete mode 100644 aws/rhel-8.9-nightly-aarch64/main.tf
 delete mode 100644 aws/rhel-8.9-nightly-x86_64/config.json
 delete mode 100644 aws/rhel-8.9-nightly-x86_64/main.tf
 delete mode 100644 aws/rhel-9.3-nightly-aarch64/config.json
 delete mode 100644 aws/rhel-9.3-nightly-aarch64/main.tf
 delete mode 100644 aws/rhel-9.3-nightly-x86_64/config.json
 delete mode 100644 aws/rhel-9.3-nightly-x86_64/main.tf
 delete mode 100644 aws/rhel-9.4-nightly-aarch64/config.json
 delete mode 100644 aws/rhel-9.4-nightly-aarch64/main.tf
 delete mode 100644 aws/rhel-9.4-nightly-x86_64/config.json
 delete mode 100644 aws/rhel-9.4-nightly-x86_64/main.tf
 delete mode 100644 gcp/rhel-8.10-nightly-x86_64/config.json
 delete mode 100644 gcp/rhel-8.10-nightly-x86_64/main.tf
 delete mode 100644 gcp/rhel-8.9-nightly-x86_64/config.json
 delete mode 100644 gcp/rhel-8.9-nightly-x86_64/main.tf
 delete mode 100644 gcp/rhel-9.3-nightly-x86_64/config.json
 delete mode 100644 gcp/rhel-9.3-nightly-x86_64/main.tf
 delete mode 100644 gcp/rhel-9.4-nightly-x86_64/config.json
 delete mode 100644 gcp/rhel-9.4-nightly-x86_64/main.tf
 delete mode 100644 rhos-01/rhel-8.10-nightly-x86_64-large/config.json
 delete mode 100644 rhos-01/rhel-8.10-nightly-x86_64-large/main.tf
 delete mode 100644 rhos-01/rhel-8.10-nightly-x86_64/config.json
 delete mode 100644 rhos-01/rhel-8.10-nightly-x86_64/main.tf
 delete mode 100644 rhos-01/rhel-8.9-nightly-x86_64-large/config.json
 delete mode 100644 rhos-01/rhel-8.9-nightly-x86_64-large/main.tf
 delete mode 100644 rhos-01/rhel-8.9-nightly-x86_64/config.json
 delete mode 100644 rhos-01/rhel-8.9-nightly-x86_64/main.tf
 delete mode 100644 rhos-01/rhel-9.3-nightly-x86_64-large/config.json
 delete mode 100644 rhos-01/rhel-9.3-nightly-x86_64-large/main.tf
 delete mode 100644 rhos-01/rhel-9.3-nightly-x86_64/config.json
 delete mode 100644 rhos-01/rhel-9.3-nightly-x86_64/main.tf
 delete mode 100644 rhos-01/rhel-9.4-nightly-x86_64-large/config.json
 delete mode 100644 rhos-01/rhel-9.4-nightly-x86_64-large/main.tf
 delete mode 100644 rhos-01/rhel-9.4-nightly-x86_64/config.json
 delete mode 100644 rhos-01/rhel-9.4-nightly-x86_64/main.tf

diff --git a/aws/rhel-8.10-nightly-aarch64/config.json b/aws/rhel-8.10-nightly-aarch64/config.json
deleted file mode 100644
index d285b04..0000000
--- a/aws/rhel-8.10-nightly-aarch64/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "ec2-user",
-    "runnerArch": "aarch64",
-    "prepareScript": "sudo rm -f /etc/yum.repos.d/*.repo; sudo tee /etc/yum.repos.d/rhel8internal.repo <<EOT\n[RHEL-8-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/BaseOS/aarch64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/AppStream/aarch64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/CRB/aarch64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/aws/rhel-8.10-nightly-aarch64/main.tf b/aws/rhel-8.10-nightly-aarch64/main.tf
deleted file mode 100644
index 69cb64e..0000000
--- a/aws/rhel-8.10-nightly-aarch64/main.tf
+++ /dev/null
@@ -1,60 +0,0 @@
-module "aws" {
-  source = "../_base"
-
-  name                 = "rhel-8.10-nightly-aarch64"
-  ami                  = "ami-06b3b4097c6387a99"
-  instance_types       = ["m6g.large", "m6gd.large", "m7g.large", "m7gd.large"]
-  internal_network     = var.internal_network
-  job_name             = var.job_name
-  project              = var.project
-  branch               = var.branch
-  pipeline_id          = var.pipeline_id
-  pipeline_source      = var.pipeline_source
-  iam_instance_profile = var.iam_instance_profile
-}
-
-variable "internal_network" {
-  type        = bool
-  description = "Whether this instance should be in the internal network (default: false)."
-  default     = false
-}
-
-output "ip_address" {
-  value = module.aws.ip_address
-}
-
-variable "job_name" {
-  description = "the job_name the instance is performing"
-  type        = string
-  default     = "unset"
-}
-
-variable "project" {
-  description = "the associated project"
-  type        = string
-  default     = "unset"
-}
-
-variable "branch" {
-  description = "the associated branch"
-  type        = string
-  default     = "unset"
-}
-
-variable "pipeline_id" {
-  description = "the associated pipeline_id"
-  type        = string
-  default     = "unset"
-}
-
-variable "pipeline_source" {
-  description = "the source that trigger the job"
-  type        = string
-  default     = "unset"
-}
-
-variable "iam_instance_profile" {
-  description = "instance profile to attach to the runner, the profile must exist"
-  type        = string
-  default     = null
-}
diff --git a/aws/rhel-8.10-nightly-x86_64/config.json b/aws/rhel-8.10-nightly-x86_64/config.json
deleted file mode 100644
index d8f8a9f..0000000
--- a/aws/rhel-8.10-nightly-x86_64/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "ec2-user",
-    "runnerArch": "amd64",
-    "prepareScript": "sudo rm -f /etc/yum.repos.d/*.repo; sudo tee /etc/yum.repos.d/rhel8internal.repo <<EOT\n[RHEL-8-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/BaseOS/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/AppStream/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/CRB/x86_64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/aws/rhel-8.10-nightly-x86_64/main.tf b/aws/rhel-8.10-nightly-x86_64/main.tf
deleted file mode 100644
index a1f0b05..0000000
--- a/aws/rhel-8.10-nightly-x86_64/main.tf
+++ /dev/null
@@ -1,60 +0,0 @@
-module "aws" {
-  source = "../_base"
-
-  name                 = "rhel-8.10-nightly-x86_64"
-  ami                  = "ami-0c7095f5c075ec4bb"
-  instance_types       = ["m5.large", "m5d.large", "m5a.large", "m5ad.large", "m6a.large", "m6i.large", "m6id.large", "m7i.large", "m7a.large"]
-  internal_network     = var.internal_network
-  job_name             = var.job_name
-  project              = var.project
-  branch               = var.branch
-  pipeline_id          = var.pipeline_id
-  pipeline_source      = var.pipeline_source
-  iam_instance_profile = var.iam_instance_profile
-}
-
-variable "internal_network" {
-  type        = bool
-  description = "Whether this instance should be in the internal network (default: false)."
-  default     = false
-}
-
-output "ip_address" {
-  value = module.aws.ip_address
-}
-
-variable "job_name" {
-  description = "the job_name the instance is performing"
-  type        = string
-  default     = "unset"
-}
-
-variable "project" {
-  description = "the associated project"
-  type        = string
-  default     = "unset"
-}
-
-variable "branch" {
-  description = "the associated branch"
-  type        = string
-  default     = "unset"
-}
-
-variable "pipeline_id" {
-  description = "the associated pipeline_id"
-  type        = string
-  default     = "unset"
-}
-
-variable "pipeline_source" {
-  description = "the source that trigger the job"
-  type        = string
-  default     = "unset"
-}
-
-variable "iam_instance_profile" {
-  description = "instance profile to attach to the runner, the profile must exist"
-  type        = string
-  default     = null
-}
diff --git a/aws/rhel-8.9-nightly-aarch64/config.json b/aws/rhel-8.9-nightly-aarch64/config.json
deleted file mode 100644
index 51d5a73..0000000
--- a/aws/rhel-8.9-nightly-aarch64/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "ec2-user",
-    "runnerArch": "aarch64",
-    "prepareScript": "sudo rm -f /etc/yum.repos.d/*.repo; sudo tee /etc/yum.repos.d/rhel8internal.repo <<EOT\n[RHEL-8-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9.0/compose/BaseOS/aarch64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9.0/compose/AppStream/aarch64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9.0/compose/CRB/aarch64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/aws/rhel-8.9-nightly-aarch64/main.tf b/aws/rhel-8.9-nightly-aarch64/main.tf
deleted file mode 100644
index 54fa56e..0000000
--- a/aws/rhel-8.9-nightly-aarch64/main.tf
+++ /dev/null
@@ -1,60 +0,0 @@
-module "aws" {
-  source = "../_base"
-
-  name                 = "rhel-8.9-nightly-aarch64"
-  ami                  = "ami-0f943fa3e140fe2da"
-  instance_types       = ["m6g.large", "m6gd.large", "m7g.large", "m7gd.large"]
-  internal_network     = var.internal_network
-  job_name             = var.job_name
-  project              = var.project
-  branch               = var.branch
-  pipeline_id          = var.pipeline_id
-  pipeline_source      = var.pipeline_source
-  iam_instance_profile = var.iam_instance_profile
-}
-
-variable "internal_network" {
-  type        = bool
-  description = "Whether this instance should be in the internal network (default: false)."
-  default     = false
-}
-
-output "ip_address" {
-  value = module.aws.ip_address
-}
-
-variable "job_name" {
-  description = "the job_name the instance is performing"
-  type        = string
-  default     = "unset"
-}
-
-variable "project" {
-  description = "the associated project"
-  type        = string
-  default     = "unset"
-}
-
-variable "branch" {
-  description = "the associated branch"
-  type        = string
-  default     = "unset"
-}
-
-variable "pipeline_id" {
-  description = "the associated pipeline_id"
-  type        = string
-  default     = "unset"
-}
-
-variable "pipeline_source" {
-  description = "the source that trigger the job"
-  type        = string
-  default     = "unset"
-}
-
-variable "iam_instance_profile" {
-  description = "instance profile to attach to the runner, the profile must exist"
-  type        = string
-  default     = null
-}
diff --git a/aws/rhel-8.9-nightly-x86_64/config.json b/aws/rhel-8.9-nightly-x86_64/config.json
deleted file mode 100644
index 374c125..0000000
--- a/aws/rhel-8.9-nightly-x86_64/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "ec2-user",
-    "runnerArch": "amd64",
-    "prepareScript": "sudo rm -f /etc/yum.repos.d/*.repo; sudo tee /etc/yum.repos.d/rhel8internal.repo <<EOT\n[RHEL-8-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9.0/compose/BaseOS/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9.0/compose/AppStream/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9.0/compose/CRB/x86_64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/aws/rhel-8.9-nightly-x86_64/main.tf b/aws/rhel-8.9-nightly-x86_64/main.tf
deleted file mode 100644
index 429fc55..0000000
--- a/aws/rhel-8.9-nightly-x86_64/main.tf
+++ /dev/null
@@ -1,60 +0,0 @@
-module "aws" {
-  source = "../_base"
-
-  name                 = "rhel-8.9-nightly-x86_64"
-  ami                  = "ami-071f90bdf8487b83e"
-  instance_types       = ["m5.large", "m5d.large", "m5a.large", "m5ad.large", "m6a.large", "m6i.large", "m6id.large", "m7i.large", "m7a.large"]
-  internal_network     = var.internal_network
-  job_name             = var.job_name
-  project              = var.project
-  branch               = var.branch
-  pipeline_id          = var.pipeline_id
-  pipeline_source      = var.pipeline_source
-  iam_instance_profile = var.iam_instance_profile
-}
-
-variable "internal_network" {
-  type        = bool
-  description = "Whether this instance should be in the internal network (default: false)."
-  default     = false
-}
-
-output "ip_address" {
-  value = module.aws.ip_address
-}
-
-variable "job_name" {
-  description = "the job_name the instance is performing"
-  type        = string
-  default     = "unset"
-}
-
-variable "project" {
-  description = "the associated project"
-  type        = string
-  default     = "unset"
-}
-
-variable "branch" {
-  description = "the associated branch"
-  type        = string
-  default     = "unset"
-}
-
-variable "pipeline_id" {
-  description = "the associated pipeline_id"
-  type        = string
-  default     = "unset"
-}
-
-variable "pipeline_source" {
-  description = "the source that trigger the job"
-  type        = string
-  default     = "unset"
-}
-
-variable "iam_instance_profile" {
-  description = "instance profile to attach to the runner, the profile must exist"
-  type        = string
-  default     = null
-}
diff --git a/aws/rhel-9.3-nightly-aarch64/config.json b/aws/rhel-9.3-nightly-aarch64/config.json
deleted file mode 100644
index 3d62658..0000000
--- a/aws/rhel-9.3-nightly-aarch64/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "ec2-user",
-    "runnerArch": "aarch64",
-    "prepareScript": "sudo rm -f /etc/yum.repos.d/*.repo; sudo tee /etc/yum.repos.d/rhel9internal.repo <<EOT\n[RHEL-9-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3/compose/BaseOS/aarch64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3/compose/AppStream/aarch64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3/compose/CRB/aarch64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/aws/rhel-9.3-nightly-aarch64/main.tf b/aws/rhel-9.3-nightly-aarch64/main.tf
deleted file mode 100644
index 0ed6add..0000000
--- a/aws/rhel-9.3-nightly-aarch64/main.tf
+++ /dev/null
@@ -1,60 +0,0 @@
-module "aws" {
-  source = "../_base"
-
-  name                 = "rhel-9.3-nightly-aarch64"
-  ami                  = "ami-0f0936e4c473c129b"
-  instance_types       = ["m6g.large", "m6gd.large", "m7g.large", "m7gd.large"]
-  internal_network     = var.internal_network
-  job_name             = var.job_name
-  project              = var.project
-  branch               = var.branch
-  pipeline_id          = var.pipeline_id
-  pipeline_source      = var.pipeline_source
-  iam_instance_profile = var.iam_instance_profile
-}
-
-variable "internal_network" {
-  type        = bool
-  description = "Whether this instance should be in the internal network (default: false)."
-  default     = false
-}
-
-output "ip_address" {
-  value = module.aws.ip_address
-}
-
-variable "job_name" {
-  description = "the job_name the instance is performing"
-  type        = string
-  default     = "unset"
-}
-
-variable "project" {
-  description = "the associated project"
-  type        = string
-  default     = "unset"
-}
-
-variable "branch" {
-  description = "the associated branch"
-  type        = string
-  default     = "unset"
-}
-
-variable "pipeline_id" {
-  description = "the associated pipeline_id"
-  type        = string
-  default     = "unset"
-}
-
-variable "pipeline_source" {
-  description = "the source that trigger the job"
-  type        = string
-  default     = "unset"
-}
-
-variable "iam_instance_profile" {
-  description = "instance profile to attach to the runner, the profile must exist"
-  type        = string
-  default     = null
-}
diff --git a/aws/rhel-9.3-nightly-x86_64/config.json b/aws/rhel-9.3-nightly-x86_64/config.json
deleted file mode 100644
index 611928f..0000000
--- a/aws/rhel-9.3-nightly-x86_64/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "ec2-user",
-    "runnerArch": "amd64",
-    "prepareScript": "sudo rm -f /etc/yum.repos.d/*.repo; sudo tee /etc/yum.repos.d/rhel9internal.repo <<EOT\n[RHEL-9-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3/compose/BaseOS/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3/compose/AppStream/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3/compose/CRB/x86_64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/aws/rhel-9.3-nightly-x86_64/main.tf b/aws/rhel-9.3-nightly-x86_64/main.tf
deleted file mode 100644
index 014a2e5..0000000
--- a/aws/rhel-9.3-nightly-x86_64/main.tf
+++ /dev/null
@@ -1,60 +0,0 @@
-module "aws" {
-  source = "../_base"
-
-  name                 = "rhel-9.3-nightly-x86_64"
-  ami                  = "ami-0be81136223f0bb55"
-  instance_types       = ["m5.large", "m5d.large", "m5a.large", "m5ad.large", "m6a.large", "m6i.large", "m6id.large", "m7i.large", "m7a.large"]
-  internal_network     = var.internal_network
-  job_name             = var.job_name
-  project              = var.project
-  branch               = var.branch
-  pipeline_id          = var.pipeline_id
-  pipeline_source      = var.pipeline_source
-  iam_instance_profile = var.iam_instance_profile
-}
-
-variable "internal_network" {
-  type        = bool
-  description = "Whether this instance should be in the internal network (default: false)."
-  default     = false
-}
-
-output "ip_address" {
-  value = module.aws.ip_address
-}
-
-variable "job_name" {
-  description = "the job_name the instance is performing"
-  type        = string
-  default     = "unset"
-}
-
-variable "project" {
-  description = "the associated project"
-  type        = string
-  default     = "unset"
-}
-
-variable "branch" {
-  description = "the associated branch"
-  type        = string
-  default     = "unset"
-}
-
-variable "pipeline_id" {
-  description = "the associated pipeline_id"
-  type        = string
-  default     = "unset"
-}
-
-variable "pipeline_source" {
-  description = "the source that trigger the job"
-  type        = string
-  default     = "unset"
-}
-
-variable "iam_instance_profile" {
-  description = "instance profile to attach to the runner, the profile must exist"
-  type        = string
-  default     = null
-}
diff --git a/aws/rhel-9.4-nightly-aarch64/config.json b/aws/rhel-9.4-nightly-aarch64/config.json
deleted file mode 100644
index a78c0eb..0000000
--- a/aws/rhel-9.4-nightly-aarch64/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "ec2-user",
-    "runnerArch": "aarch64",
-    "prepareScript": "sudo rm -f /etc/yum.repos.d/*.repo; sudo tee /etc/yum.repos.d/rhel9internal.repo <<EOT\n[RHEL-9-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4/compose/BaseOS/aarch64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4/compose/AppStream/aarch64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4/compose/CRB/aarch64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/aws/rhel-9.4-nightly-aarch64/main.tf b/aws/rhel-9.4-nightly-aarch64/main.tf
deleted file mode 100644
index 9e5cfdc..0000000
--- a/aws/rhel-9.4-nightly-aarch64/main.tf
+++ /dev/null
@@ -1,60 +0,0 @@
-module "aws" {
-  source = "../_base"
-
-  name                 = "rhel-9.4-nightly-aarch64"
-  ami                  = "ami-0f31cc255cbba3042"
-  instance_types       = ["m6g.large", "m6gd.large", "m7g.large", "m7gd.large"]
-  internal_network     = var.internal_network
-  job_name             = var.job_name
-  project              = var.project
-  branch               = var.branch
-  pipeline_id          = var.pipeline_id
-  pipeline_source      = var.pipeline_source
-  iam_instance_profile = var.iam_instance_profile
-}
-
-variable "internal_network" {
-  type        = bool
-  description = "Whether this instance should be in the internal network (default: false)."
-  default     = false
-}
-
-output "ip_address" {
-  value = module.aws.ip_address
-}
-
-variable "job_name" {
-  description = "the job_name the instance is performing"
-  type        = string
-  default     = "unset"
-}
-
-variable "project" {
-  description = "the associated project"
-  type        = string
-  default     = "unset"
-}
-
-variable "branch" {
-  description = "the associated branch"
-  type        = string
-  default     = "unset"
-}
-
-variable "pipeline_id" {
-  description = "the associated pipeline_id"
-  type        = string
-  default     = "unset"
-}
-
-variable "pipeline_source" {
-  description = "the source that trigger the job"
-  type        = string
-  default     = "unset"
-}
-
-variable "iam_instance_profile" {
-  description = "instance profile to attach to the runner, the profile must exist"
-  type        = string
-  default     = null
-}
diff --git a/aws/rhel-9.4-nightly-x86_64/config.json b/aws/rhel-9.4-nightly-x86_64/config.json
deleted file mode 100644
index 4a5bf49..0000000
--- a/aws/rhel-9.4-nightly-x86_64/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "ec2-user",
-    "runnerArch": "amd64",
-    "prepareScript": "sudo rm -f /etc/yum.repos.d/*.repo; sudo tee /etc/yum.repos.d/rhel9internal.repo <<EOT\n[RHEL-9-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4/compose/BaseOS/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4/compose/AppStream/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4/compose/CRB/x86_64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/aws/rhel-9.4-nightly-x86_64/main.tf b/aws/rhel-9.4-nightly-x86_64/main.tf
deleted file mode 100644
index 26838c7..0000000
--- a/aws/rhel-9.4-nightly-x86_64/main.tf
+++ /dev/null
@@ -1,60 +0,0 @@
-module "aws" {
-  source = "../_base"
-
-  name                 = "rhel-9.4-nightly-x86_64"
-  ami                  = "ami-006c774d6c0b73ca9"
-  instance_types       = ["m5.large", "m5d.large", "m5a.large", "m5ad.large", "m6a.large", "m6i.large", "m6id.large", "m7i.large", "m7a.large"]
-  internal_network     = var.internal_network
-  job_name             = var.job_name
-  project              = var.project
-  branch               = var.branch
-  pipeline_id          = var.pipeline_id
-  pipeline_source      = var.pipeline_source
-  iam_instance_profile = var.iam_instance_profile
-}
-
-variable "internal_network" {
-  type        = bool
-  description = "Whether this instance should be in the internal network (default: false)."
-  default     = false
-}
-
-output "ip_address" {
-  value = module.aws.ip_address
-}
-
-variable "job_name" {
-  description = "the job_name the instance is performing"
-  type        = string
-  default     = "unset"
-}
-
-variable "project" {
-  description = "the associated project"
-  type        = string
-  default     = "unset"
-}
-
-variable "branch" {
-  description = "the associated branch"
-  type        = string
-  default     = "unset"
-}
-
-variable "pipeline_id" {
-  description = "the associated pipeline_id"
-  type        = string
-  default     = "unset"
-}
-
-variable "pipeline_source" {
-  description = "the source that trigger the job"
-  type        = string
-  default     = "unset"
-}
-
-variable "iam_instance_profile" {
-  description = "instance profile to attach to the runner, the profile must exist"
-  type        = string
-  default     = null
-}
diff --git a/gcp/rhel-8.10-nightly-x86_64/config.json b/gcp/rhel-8.10-nightly-x86_64/config.json
deleted file mode 100644
index e1256b2..0000000
--- a/gcp/rhel-8.10-nightly-x86_64/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "cloud-user",
-    "runnerArch": "amd64",
-    "prepareScript": "sudo rm -f /etc/yum.repos.d/*.repo; sudo tee /etc/yum.repos.d/rhel8internal.repo <<EOT\n[RHEL-8-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/BaseOS/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/AppStream/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/CRB/x86_64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/gcp/rhel-8.10-nightly-x86_64/main.tf b/gcp/rhel-8.10-nightly-x86_64/main.tf
deleted file mode 100644
index ed149e8..0000000
--- a/gcp/rhel-8.10-nightly-x86_64/main.tf
+++ /dev/null
@@ -1,16 +0,0 @@
-module "google" {
-  source           = "../_base"
-  image            = "rhel-810-nightly"
-  machine_type     = "n2-standard-4"
-  internal_network = var.internal_network
-}
-
-output "ip_address" {
-  value = module.google.ip_address
-}
-
-variable "internal_network" {
-  type        = bool
-  description = "Whether this instance should be in the internal network (default: false)."
-  default     = false
-}
diff --git a/gcp/rhel-8.9-nightly-x86_64/config.json b/gcp/rhel-8.9-nightly-x86_64/config.json
deleted file mode 100644
index f4a132e..0000000
--- a/gcp/rhel-8.9-nightly-x86_64/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "cloud-user",
-    "runnerArch": "amd64",
-    "prepareScript": "sudo rm -f /etc/yum.repos.d/*.repo; sudo tee /etc/yum.repos.d/rhel8internal.repo <<EOT\n[RHEL-8-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9.0/compose/BaseOS/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9.0/compose/AppStream/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9.0/compose/CRB/x86_64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/gcp/rhel-8.9-nightly-x86_64/main.tf b/gcp/rhel-8.9-nightly-x86_64/main.tf
deleted file mode 100644
index 307c0e1..0000000
--- a/gcp/rhel-8.9-nightly-x86_64/main.tf
+++ /dev/null
@@ -1,16 +0,0 @@
-module "google" {
-  source           = "../_base"
-  image            = "rhel-89-20230503-20-nightly"
-  machine_type     = "n2-standard-4"
-  internal_network = var.internal_network
-}
-
-output "ip_address" {
-  value = module.google.ip_address
-}
-
-variable "internal_network" {
-  type        = bool
-  description = "Whether this instance should be in the internal network (default: false)."
-  default     = false
-}
diff --git a/gcp/rhel-9.3-nightly-x86_64/config.json b/gcp/rhel-9.3-nightly-x86_64/config.json
deleted file mode 100644
index 3a7640e..0000000
--- a/gcp/rhel-9.3-nightly-x86_64/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "cloud-user",
-    "runnerArch": "amd64",
-    "prepareScript": "sudo rm -f /etc/yum.repos.d/*.repo; sudo tee /etc/yum.repos.d/rhel9internal.repo <<EOT\n[RHEL-9-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3/compose/BaseOS/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3/compose/AppStream/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3/compose/CRB/x86_64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/gcp/rhel-9.3-nightly-x86_64/main.tf b/gcp/rhel-9.3-nightly-x86_64/main.tf
deleted file mode 100644
index 0b9b837..0000000
--- a/gcp/rhel-9.3-nightly-x86_64/main.tf
+++ /dev/null
@@ -1,16 +0,0 @@
-module "google" {
-  source           = "../_base"
-  image            = "rhel-93-20230504-0-nightly"
-  machine_type     = "n2-standard-4"
-  internal_network = var.internal_network
-}
-
-output "ip_address" {
-  value = module.google.ip_address
-}
-
-variable "internal_network" {
-  type        = bool
-  description = "Whether this instance should be in the internal network (default: false)."
-  default     = false
-}
diff --git a/gcp/rhel-9.4-nightly-x86_64/config.json b/gcp/rhel-9.4-nightly-x86_64/config.json
deleted file mode 100644
index 9b63bdd..0000000
--- a/gcp/rhel-9.4-nightly-x86_64/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "cloud-user",
-    "runnerArch": "amd64",
-    "prepareScript": "sudo rm -f /etc/yum.repos.d/*.repo; sudo tee /etc/yum.repos.d/rhel9internal.repo <<EOT\n[RHEL-9-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4/compose/BaseOS/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4/compose/AppStream/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4/compose/CRB/x86_64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/gcp/rhel-9.4-nightly-x86_64/main.tf b/gcp/rhel-9.4-nightly-x86_64/main.tf
deleted file mode 100644
index 4307a9b..0000000
--- a/gcp/rhel-9.4-nightly-x86_64/main.tf
+++ /dev/null
@@ -1,16 +0,0 @@
-module "google" {
-  source           = "../_base"
-  image            = "rhel-94-nightly"
-  machine_type     = "n2-standard-4"
-  internal_network = var.internal_network
-}
-
-output "ip_address" {
-  value = module.google.ip_address
-}
-
-variable "internal_network" {
-  type        = bool
-  description = "Whether this instance should be in the internal network (default: false)."
-  default     = false
-}
diff --git a/rhos-01/rhel-8.10-nightly-x86_64-large/config.json b/rhos-01/rhel-8.10-nightly-x86_64-large/config.json
deleted file mode 100644
index 5535fb7..0000000
--- a/rhos-01/rhel-8.10-nightly-x86_64-large/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "cloud-user",
-    "runnerArch": "amd64",
-    "prepareScript": "sudo tee /etc/yum.repos.d/rhel8internal.repo <<EOT\n[RHEL-8-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/BaseOS/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/AppStream/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/CRB/x86_64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/rhos-01/rhel-8.10-nightly-x86_64-large/main.tf b/rhos-01/rhel-8.10-nightly-x86_64-large/main.tf
deleted file mode 100644
index c3364a2..0000000
--- a/rhos-01/rhel-8.10-nightly-x86_64-large/main.tf
+++ /dev/null
@@ -1,11 +0,0 @@
-module "openstack" {
-  source = "../_base"
-
-  name      = "rhel-8-10-nightly-large"
-  image_id  = "f59beb6f-bcb1-4a58-abf6-4aa6c8e888a4"
-  flavor_id = "2c6908ed-bb2b-43c7-8f9d-de790df5a4c0"
-}
-
-output "ip_address" {
-  value = module.openstack.ip_address
-}
diff --git a/rhos-01/rhel-8.10-nightly-x86_64/config.json b/rhos-01/rhel-8.10-nightly-x86_64/config.json
deleted file mode 100644
index 5535fb7..0000000
--- a/rhos-01/rhel-8.10-nightly-x86_64/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "cloud-user",
-    "runnerArch": "amd64",
-    "prepareScript": "sudo tee /etc/yum.repos.d/rhel8internal.repo <<EOT\n[RHEL-8-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/BaseOS/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/AppStream/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10.0/compose/CRB/x86_64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/rhos-01/rhel-8.10-nightly-x86_64/main.tf b/rhos-01/rhel-8.10-nightly-x86_64/main.tf
deleted file mode 100644
index e157385..0000000
--- a/rhos-01/rhel-8.10-nightly-x86_64/main.tf
+++ /dev/null
@@ -1,11 +0,0 @@
-module "openstack" {
-  source = "../_base"
-
-  name      = "rhel-8-10-nightly"
-  image_id  = "f59beb6f-bcb1-4a58-abf6-4aa6c8e888a4"
-  flavor_id = "bca7d8ab-b1a4-4883-b4c6-a9536d51ebdd"
-}
-
-output "ip_address" {
-  value = module.openstack.ip_address
-}
diff --git a/rhos-01/rhel-8.9-nightly-x86_64-large/config.json b/rhos-01/rhel-8.9-nightly-x86_64-large/config.json
deleted file mode 100644
index 627fff2..0000000
--- a/rhos-01/rhel-8.9-nightly-x86_64-large/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "cloud-user",
-    "runnerArch": "amd64",
-    "prepareScript": "sudo tee /etc/yum.repos.d/rhel8internal.repo <<EOT\n[RHEL-8-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9.0/compose/BaseOS/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9.0/compose/AppStream/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9.0/compose/CRB/x86_64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/rhos-01/rhel-8.9-nightly-x86_64-large/main.tf b/rhos-01/rhel-8.9-nightly-x86_64-large/main.tf
deleted file mode 100644
index aabd983..0000000
--- a/rhos-01/rhel-8.9-nightly-x86_64-large/main.tf
+++ /dev/null
@@ -1,11 +0,0 @@
-module "openstack" {
-  source = "../_base"
-
-  name      = "rhel-8-9-nightly-large"
-  image_id  = "abfa0bc2-f34c-448a-963f-676a5ff3cae9"
-  flavor_id = "2c6908ed-bb2b-43c7-8f9d-de790df5a4c0"
-}
-
-output "ip_address" {
-  value = module.openstack.ip_address
-}
diff --git a/rhos-01/rhel-8.9-nightly-x86_64/config.json b/rhos-01/rhel-8.9-nightly-x86_64/config.json
deleted file mode 100644
index 627fff2..0000000
--- a/rhos-01/rhel-8.9-nightly-x86_64/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "cloud-user",
-    "runnerArch": "amd64",
-    "prepareScript": "sudo tee /etc/yum.repos.d/rhel8internal.repo <<EOT\n[RHEL-8-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9.0/compose/BaseOS/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9.0/compose/AppStream/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-8-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9.0/compose/CRB/x86_64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/rhos-01/rhel-8.9-nightly-x86_64/main.tf b/rhos-01/rhel-8.9-nightly-x86_64/main.tf
deleted file mode 100644
index 9733a9e..0000000
--- a/rhos-01/rhel-8.9-nightly-x86_64/main.tf
+++ /dev/null
@@ -1,11 +0,0 @@
-module "openstack" {
-  source = "../_base"
-
-  name      = "rhel-8-9-nightly"
-  image_id  = "abfa0bc2-f34c-448a-963f-676a5ff3cae9"
-  flavor_id = "bca7d8ab-b1a4-4883-b4c6-a9536d51ebdd"
-}
-
-output "ip_address" {
-  value = module.openstack.ip_address
-}
diff --git a/rhos-01/rhel-9.3-nightly-x86_64-large/config.json b/rhos-01/rhel-9.3-nightly-x86_64-large/config.json
deleted file mode 100644
index d4bff5f..0000000
--- a/rhos-01/rhel-9.3-nightly-x86_64-large/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "cloud-user",
-    "runnerArch": "amd64",
-    "prepareScript": "sudo tee /etc/yum.repos.d/rhel9internal.repo <<EOT\n[RHEL-9-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3.0/compose/BaseOS/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3.0/compose/AppStream/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3.0/compose/CRB/x86_64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/rhos-01/rhel-9.3-nightly-x86_64-large/main.tf b/rhos-01/rhel-9.3-nightly-x86_64-large/main.tf
deleted file mode 100644
index a99684a..0000000
--- a/rhos-01/rhel-9.3-nightly-x86_64-large/main.tf
+++ /dev/null
@@ -1,11 +0,0 @@
-module "openstack" {
-  source = "../_base"
-
-  name      = "rhel-9-3-nightly-large"
-  image_id  = "34104e4d-a1bb-4791-887c-1ecb8d47cc89"
-  flavor_id = "2c6908ed-bb2b-43c7-8f9d-de790df5a4c0"
-}
-
-output "ip_address" {
-  value = module.openstack.ip_address
-}
diff --git a/rhos-01/rhel-9.3-nightly-x86_64/config.json b/rhos-01/rhel-9.3-nightly-x86_64/config.json
deleted file mode 100644
index d4bff5f..0000000
--- a/rhos-01/rhel-9.3-nightly-x86_64/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "cloud-user",
-    "runnerArch": "amd64",
-    "prepareScript": "sudo tee /etc/yum.repos.d/rhel9internal.repo <<EOT\n[RHEL-9-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3.0/compose/BaseOS/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3.0/compose/AppStream/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3.0/compose/CRB/x86_64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/rhos-01/rhel-9.3-nightly-x86_64/main.tf b/rhos-01/rhel-9.3-nightly-x86_64/main.tf
deleted file mode 100644
index 1d2e5bb..0000000
--- a/rhos-01/rhel-9.3-nightly-x86_64/main.tf
+++ /dev/null
@@ -1,11 +0,0 @@
-module "openstack" {
-  source = "../_base"
-
-  name      = "rhel-9-3-nightly"
-  image_id  = "34104e4d-a1bb-4791-887c-1ecb8d47cc89"
-  flavor_id = "bca7d8ab-b1a4-4883-b4c6-a9536d51ebdd"
-}
-
-output "ip_address" {
-  value = module.openstack.ip_address
-}
diff --git a/rhos-01/rhel-9.4-nightly-x86_64-large/config.json b/rhos-01/rhel-9.4-nightly-x86_64-large/config.json
deleted file mode 100644
index 7407e7c..0000000
--- a/rhos-01/rhel-9.4-nightly-x86_64-large/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "cloud-user",
-    "runnerArch": "amd64",
-    "prepareScript": "sudo tee /etc/yum.repos.d/rhel9internal.repo <<EOT\n[RHEL-9-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4.0/compose/BaseOS/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4.0/compose/AppStream/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4.0/compose/CRB/x86_64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/rhos-01/rhel-9.4-nightly-x86_64-large/main.tf b/rhos-01/rhel-9.4-nightly-x86_64-large/main.tf
deleted file mode 100644
index 43a8998..0000000
--- a/rhos-01/rhel-9.4-nightly-x86_64-large/main.tf
+++ /dev/null
@@ -1,11 +0,0 @@
-module "openstack" {
-  source = "../_base"
-
-  name      = "rhel-9-4-nightly-large"
-  image_id  = "5879bd0c-ebeb-45da-b3d9-fa63dd5fe831"
-  flavor_id = "2c6908ed-bb2b-43c7-8f9d-de790df5a4c0"
-}
-
-output "ip_address" {
-  value = module.openstack.ip_address
-}
diff --git a/rhos-01/rhel-9.4-nightly-x86_64/config.json b/rhos-01/rhel-9.4-nightly-x86_64/config.json
deleted file mode 100644
index 7407e7c..0000000
--- a/rhos-01/rhel-9.4-nightly-x86_64/config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "cloud-user",
-    "runnerArch": "amd64",
-    "prepareScript": "sudo tee /etc/yum.repos.d/rhel9internal.repo <<EOT\n[RHEL-9-NIGHTLY-BaseOS]\nname=baseos\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4.0/compose/BaseOS/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-AppStream]\nname=appstream\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4.0/compose/AppStream/x86_64/os/\nenabled=1\ngpgcheck=0\n\n[RHEL-9-NIGHTLY-CRB]\nname=crb\nbaseurl=http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4.0/compose/CRB/x86_64/os/\nenabled=1\ngpgcheck=0\nEOT"
-}
diff --git a/rhos-01/rhel-9.4-nightly-x86_64/main.tf b/rhos-01/rhel-9.4-nightly-x86_64/main.tf
deleted file mode 100644
index 6d99d13..0000000
--- a/rhos-01/rhel-9.4-nightly-x86_64/main.tf
+++ /dev/null
@@ -1,11 +0,0 @@
-module "openstack" {
-  source = "../_base"
-
-  name      = "rhel-9-4-nightly"
-  image_id  = "5879bd0c-ebeb-45da-b3d9-fa63dd5fe831"
-  flavor_id = "bca7d8ab-b1a4-4883-b4c6-a9536d51ebdd"
-}
-
-output "ip_address" {
-  value = module.openstack.ip_address
-}