diff --git a/scripts/aws/manage_aws_stack.sh b/scripts/aws/manage_aws_stack.sh
index d3586e335a..004e908673 100755
--- a/scripts/aws/manage_aws_stack.sh
+++ b/scripts/aws/manage_aws_stack.sh
@@ -128,7 +128,7 @@ get_amis() {
     local -r region="${3}"
     local ami_table
     ami_table=$(aws ec2 describe-images --region "${region}" \
-        --filters "Name=name,Values=$(tr '[:lower:]' '[:upper:]' <<< "${os}")*HVM-*Hourly2-GP3" "Name=architecture,Values=${arch}*" \
+        --filters "Name=name,Values=$(tr '[:lower:]' '[:upper:]' <<< "${os}")*HVM*Hourly2-GP3" "Name=architecture,Values=${arch}*" \
         --query 'Images[*].[Name,ImageId,Architecture]' --output text)
   
     echo "${ami_table}" | sort -t'-' -k3,3r
diff --git a/test/image-blueprints-bootc/layer1-base/group1/rhel96-test-agent.containerfile b/test/image-blueprints-bootc/layer1-base/group1/rhel96-test-agent.containerfile
index d78a25e20f..0fb3dc0573 100644
--- a/test/image-blueprints-bootc/layer1-base/group1/rhel96-test-agent.containerfile
+++ b/test/image-blueprints-bootc/layer1-base/group1/rhel96-test-agent.containerfile
@@ -1,9 +1,4 @@
-# Note:
-# This is a workaround for the problem described in https://issues.redhat.com/browse/USHIFT-5584.
-# Revert to the rhel-9.6 base image when it is in GA.
-#
-# FROM registry.stage.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6
-FROM quay.io/centos-bootc/centos-bootc:stream9
+FROM registry.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6
 
 # Build arguments
 ARG USHIFT_RPM_REPO_NAME=microshift-local
diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc.image-bootc b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc.image-bootc
index 51606a89d1..d802c92dda 100644
--- a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc.image-bootc
+++ b/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc.image-bootc
@@ -1,6 +1 @@
-# Note:
-# This is a workaround for the problem described in https://issues.redhat.com/browse/USHIFT-5584.
-# Revert to the rhel-9.6 base image when it is in GA.
-#
-# registry.stage.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6
-quay.io/centos-bootc/centos-bootc:stream9
+registry.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6
\ No newline at end of file
diff --git a/test/scenarios-bootc/periodics/el96-crel@brew-standard1.sh.disabled b/test/scenarios-bootc/periodics/el96-crel@brew-standard1.sh.disabled
index 55c040c7fb..96eb3ca22c 100644
--- a/test/scenarios-bootc/periodics/el96-crel@brew-standard1.sh.disabled
+++ b/test/scenarios-bootc/periodics/el96-crel@brew-standard1.sh.disabled
@@ -11,13 +11,8 @@ scenario_remove_vms() {
     remove_vm host1
 }
 
-# Note:
-# This is a workaround for the problem described in https://issues.redhat.com/browse/USHIFT-5584.
-# Revert to the rhel-9.6 base image when it is in GA.
-#
-#       --variable "EXPECTED_OS_VERSION:9.6" \
 scenario_run_tests() {
     run_tests host1 \
-        --variable "EXPECTED_OS_VERSION:9" \
+        --variable "EXPECTED_OS_VERSION:9.6" \
         suites/standard1/ suites/selinux/validate-selinux-policy.robot
 }
diff --git a/test/scenarios-bootc/presubmits/el96-src@standard-suite1.sh b/test/scenarios-bootc/presubmits/el96-src@standard-suite1.sh
index 253bac3200..d30951a6ce 100644
--- a/test/scenarios-bootc/presubmits/el96-src@standard-suite1.sh
+++ b/test/scenarios-bootc/presubmits/el96-src@standard-suite1.sh
@@ -11,13 +11,8 @@ scenario_remove_vms() {
     remove_vm host1
 }
 
-# Note:
-# This is a workaround for the problem described in https://issues.redhat.com/browse/USHIFT-5584.
-# Revert to the rhel-9.6 base image when it is in GA.
-#
-#       --variable "EXPECTED_OS_VERSION:9.6" \
 scenario_run_tests() {
     run_tests host1 \
-        --variable "EXPECTED_OS_VERSION:9" \
+        --variable "EXPECTED_OS_VERSION:9.6" \
         suites/standard1/ suites/selinux/validate-selinux-policy.robot
 }