diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a15a3493d..527b93c29 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,6 +84,8 @@ RPM:
           - aws/fedora-35-aarch64
           - aws/fedora-36-x86_64
           - aws/fedora-36-aarch64
+          - aws/rhel-8.4-ga-x86_64
+          - aws/rhel-8.4-ga-aarch64
           - aws/rhel-8.6-ga-x86_64
           - aws/rhel-8.6-ga-aarch64
           - aws/rhel-9.0-ga-x86_64
@@ -167,6 +169,8 @@ Base:
       - RUNNER:
           - aws/fedora-35-x86_64
           - aws/fedora-35-aarch64
+          - aws/rhel-8.4-ga-x86_64
+          - aws/rhel-8.4-ga-aarch64
           - aws/rhel-8.6-ga-x86_64
           - aws/rhel-8.6-ga-aarch64
           - aws/rhel-9.0-ga-x86_64
@@ -214,6 +218,8 @@ Manifests:
           - aws/centos-stream-8-x86_64
           - aws/centos-stream-8-aarch64
       - RUNNER:
+          - aws/rhel-8.4-ga-x86_64
+          - aws/rhel-8.4-ga-aarch64
           - aws/rhel-8.6-ga-x86_64
           - aws/rhel-8.6-ga-aarch64
           - aws/rhel-9.0-ga-x86_64
@@ -289,6 +295,8 @@ Image Tests:
   parallel:
     matrix:
       - RUNNER:
+          - aws/rhel-8.4-ga-x86_64
+          - aws/rhel-8.4-ga-aarch64
           - aws/rhel-8.7-nightly-x86_64
           - aws/rhel-8.7-nightly-aarch64
           - aws/rhel-9.1-nightly-x86_64
@@ -307,6 +315,7 @@ OSTree:
     matrix:
       - RUNNER:
           - rhos-01/fedora-35-x86_64
+          - rhos-01/rhel-8.4-ga-x86_64
           - rhos-01/rhel-8.6-ga-x86_64
           - rhos-01/rhel-9.0-ga-x86_64
           - rhos-01/rhel-8.7-nightly-x86_64-large
@@ -390,6 +399,7 @@ Rebase OSTree:
 .rhel_runners: &rhel_runners
     RUNNER:
       - aws/centos-stream-8-x86_64
+      - aws/rhel-8.4-ga-x86_64
       - aws/rhel-8.6-ga-x86_64
       - aws/rhel-9.0-ga-x86_64
       - aws/rhel-8.7-nightly-x86_64
@@ -446,7 +456,7 @@ aws.sh:
       - "*.repo"
       - COMPOSER_NVR
     when: always
-    
+
 azure.sh:
   extends: .integration
   variables:
diff --git a/Schutzfile b/Schutzfile
index 83919888d..df3e6d204 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -153,6 +153,13 @@
       }
     ]
   },
+  "rhel-8.4": {
+    "dependencies": {
+      "osbuild": {
+        "commit": "d602b5ff7f40dd3abb956d29aa0c7573e6e0ed29"
+      }
+    }
+  },
   "rhel-8.6": {
     "dependencies": {
       "osbuild": {
diff --git a/test/cases/ostree.sh b/test/cases/ostree.sh
index 5e47aff85..55fc36513 100755
--- a/test/cases/ostree.sh
+++ b/test/cases/ostree.sh
@@ -21,12 +21,12 @@ case "${ID}-${VERSION_ID}" in
         USER_IN_COMMIT="false"
         BOOT_LOCATION="https://mirrors.rit.edu/fedora/fedora/linux/releases/35/Everything/x86_64/os/"
         ;;
-    "rhel-8.5")
-        IMAGE_TYPE=rhel-edge-commit
+    "rhel-8.4")
+        IMAGE_TYPE=edge-commit
         OSTREE_REF="rhel/8/${ARCH}/edge"
-        OS_VARIANT="rhel8.5"
+        OS_VARIANT="rhel8.4"
         USER_IN_COMMIT="true"
-        BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.5.0/BaseOS/x86_64/os/"
+        BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.4.0/BaseOS/x86_64/os/"
         ;;
     "rhel-8.6")
         IMAGE_TYPE=edge-commit