diff --git a/images/build-e2e/Containerfile b/images/build-e2e/Containerfile
index 25160ba121..94aaa7634c 100644
--- a/images/build-e2e/Containerfile
+++ b/images/build-e2e/Containerfile
@@ -1,5 +1,5 @@
 
-FROM registry.access.redhat.com/ubi9/go-toolset:1.20 AS builder
+FROM registry.access.redhat.com/ubi8/go-toolset:1.20 AS builder
 
 USER root
 
diff --git a/images/build-integration/Containerfile b/images/build-integration/Containerfile
index 6eda99fd71..ca498f963a 100644
--- a/images/build-integration/Containerfile
+++ b/images/build-integration/Containerfile
@@ -1,5 +1,5 @@
 
-FROM registry.access.redhat.com/ubi9/go-toolset:1.20 AS builder
+FROM registry.access.redhat.com/ubi8/go-toolset:1.20 AS builder
 
 USER root
 
diff --git a/images/build-integration/lib/darwin/run.sh b/images/build-integration/lib/darwin/run.sh
index 4665cca7f5..d8346eacf1 100755
--- a/images/build-integration/lib/darwin/run.sh
+++ b/images/build-integration/lib/darwin/run.sh
@@ -32,14 +32,14 @@ done
 mkdir -p $targetFolder/results
 
 # Run tests
-PATH="$PATH:${HOME}/$targetFolder/bin"
-PULL_SECRET_PATH="${HOME}/$targetFolder/pull-secret"
+export PATH="$PATH:${HOME}/$targetFolder/bin"
+export PULL_SECRET_PATH="${HOME}/$targetFolder/pull-secret"
 if [ ! -z "$bundleLocation" ]
 then
-    BUNDLE_PATH="$bundleLocation"
+    export BUNDLE_PATH="$bundleLocation"
 fi
 cd $targetFolder/bin
-. integration.test > integration.results
+./integration.test > integration.results
 
 # Copy results
 cd ..
diff --git a/images/build-integration/lib/linux/run.sh b/images/build-integration/lib/linux/run.sh
index 4665cca7f5..d8346eacf1 100755
--- a/images/build-integration/lib/linux/run.sh
+++ b/images/build-integration/lib/linux/run.sh
@@ -32,14 +32,14 @@ done
 mkdir -p $targetFolder/results
 
 # Run tests
-PATH="$PATH:${HOME}/$targetFolder/bin"
-PULL_SECRET_PATH="${HOME}/$targetFolder/pull-secret"
+export PATH="$PATH:${HOME}/$targetFolder/bin"
+export PULL_SECRET_PATH="${HOME}/$targetFolder/pull-secret"
 if [ ! -z "$bundleLocation" ]
 then
-    BUNDLE_PATH="$bundleLocation"
+    export BUNDLE_PATH="$bundleLocation"
 fi
 cd $targetFolder/bin
-. integration.test > integration.results
+./integration.test > integration.results
 
 # Copy results
 cd ..
diff --git a/test/e2e/features/story_openshift.feature b/test/e2e/features/story_openshift.feature
index 8d0bab8484..3419f87ac9 100644
--- a/test/e2e/features/story_openshift.feature
+++ b/test/e2e/features/story_openshift.feature
@@ -41,7 +41,7 @@ Feature: 4 Openshift stories
 		Given executing "oc new-project testproj" succeeds
 		# mirror
 		When executing "oc registry login --insecure=true" succeeds
-		Then executing "oc image mirror quay.io/centos7/httpd-24-centos7:centos7=default-route-openshift-image-registry.apps-crc.testing/testproj/hello:test --insecure=true --filter-by-os=linux/amd64" succeeds
+		Then executing "oc image mirror registry.access.redhat.com/ubi8/httpd-24:latest=default-route-openshift-image-registry.apps-crc.testing/testproj/hello:test --insecure=true --filter-by-os=linux/amd64" succeeds
 		And executing "oc set image-lookup hello" succeeds
 		# deploy
 		When executing "oc apply -f hello.yaml" succeeds
@@ -56,7 +56,7 @@ Feature: 4 Openshift stories
 	Scenario: Pull image locally, push to registry, deploy
 		Given podman command is available
 		And executing "oc new-project testproj" succeeds
-		When pulling image "quay.io/centos7/httpd-24-centos7:centos7", logging in, and pushing local image to internal registry succeeds
+		When pulling image "registry.access.redhat.com/ubi8/httpd-24:latest", logging in, and pushing local image to internal registry succeeds
 		And executing "oc apply -f hello.yaml" succeeds
 		When executing "oc rollout status deployment hello" succeeds
 		Then stdout should contain "successfully rolled out"
diff --git a/test/e2e/testsuite/testsuite.go b/test/e2e/testsuite/testsuite.go
index 400a8e3e90..75a430d735 100644
--- a/test/e2e/testsuite/testsuite.go
+++ b/test/e2e/testsuite/testsuite.go
@@ -996,7 +996,7 @@ func PullLoginTagPushImageSucceeds(image string) error {
 		return err
 	}
 
-	_, err = cmd.RunPodmanExpectSuccess("push", "default-route-openshift-image-registry.apps-crc.testing/testproj/hello:test", "--tls-verify=false")
+	_, err = cmd.RunPodmanExpectSuccess("push", "default-route-openshift-image-registry.apps-crc.testing/testproj/hello:test", "--remove-signatures", "--tls-verify=false")
 	if err != nil {
 		return err
 	}