diff --git a/test/extended/builds/multistage.go b/test/extended/builds/multistage.go
index 0e6551536861..7085f376901a 100644
--- a/test/extended/builds/multistage.go
+++ b/test/extended/builds/multistage.go
@@ -54,7 +54,7 @@ COPY --from=busybox:latest /bin/ping /test/
 						Source: buildv1.BuildSource{
 							Dockerfile: &testDockerfile,
 							Images: []buildv1.ImageSource{
-								{From: corev1.ObjectReference{Kind: "DockerImage", Name: "centos:7"}, As: []string{"scratch"}},
+								{From: corev1.ObjectReference{Kind: "DockerImage", Name: "registry.access.redhat.com/ubi8/ubi"}, As: []string{"scratch"}},
 							},
 						},
 						Strategy: buildv1.BuildStrategy{
@@ -82,7 +82,7 @@ COPY --from=busybox:latest /bin/ping /test/
 			o.Expect(err).NotTo(o.HaveOccurred())
 			o.Expect(s).ToNot(o.ContainSubstring("--> FROM scratch"))
 			o.Expect(s).ToNot(o.ContainSubstring("FROM busybox"))
-			o.Expect(s).To(o.ContainSubstring("STEP 1: FROM centos:7 AS test"))
+			o.Expect(s).To(o.ContainSubstring("STEP 1: FROM registry.access.redhat.com/ubi8/ubi AS test"))
 			o.Expect(s).To(o.ContainSubstring("COPY --from"))
 			o.Expect(s).To(o.ContainSubstring(fmt.Sprintf("\"OPENSHIFT_BUILD_NAMESPACE\"=\"%s\"", oc.Namespace())))
 			e2e.Logf("Build logs:\n%s", result)
diff --git a/test/extended/builds/optimized.go b/test/extended/builds/optimized.go
index 99df2b3d0335..5f2a22ce3a03 100644
--- a/test/extended/builds/optimized.go
+++ b/test/extended/builds/optimized.go
@@ -21,7 +21,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] Optimized image builds", func()
 		oc             = exutil.NewCLI("build-dockerfile-env")
 		skipLayers     = buildv1.ImageOptimizationSkipLayers
 		testDockerfile = `
-FROM centos:7
+FROM registry.access.redhat.com/ubi8/ubi
 RUN yum list installed
 USER 1001
 `
diff --git a/test/extended/cli/rsh.go b/test/extended/cli/rsh.go
index db9ff877474a..6d283bef5302 100644
--- a/test/extended/cli/rsh.go
+++ b/test/extended/cli/rsh.go
@@ -15,7 +15,7 @@ var _ = g.Describe("[sig-cli] oc rsh", func() {
 	var (
 		oc                     = exutil.NewCLI("oc-rsh")
 		multiContainersFixture = exutil.FixturePath("testdata", "cli", "pod-with-two-containers.yaml")
-		podsLabel              = exutil.ParseLabelsOrDie("name=hello-centos")
+		podsLabel              = exutil.ParseLabelsOrDie("name=hello-ubi")
 	)
 
 	g.Describe("rsh specific flags", func() {
@@ -32,10 +32,10 @@ var _ = g.Describe("[sig-cli] oc rsh", func() {
 			g.By("running the rsh command without specify container name")
 			out, err := oc.Run("rsh").Args(pods[0], "mkdir", "/tmp/test1").Output()
 			o.Expect(err).NotTo(o.HaveOccurred())
-			o.Expect(out).To(o.ContainSubstring("Defaulting container name to hello-centos"))
+			o.Expect(out).To(o.ContainSubstring("Defaulting container name to hello-ubi"))
 
 			g.By("running the rsh command with specify container name and shell")
-			_, err = oc.Run("rsh").Args("--container=hello-centos-2", "--shell=/bin/sh", pods[0], "mkdir", "/tmp/test3").Output()
+			_, err = oc.Run("rsh").Args("--container=hello-ubi-2", "--shell=/bin/sh", pods[0], "mkdir", "/tmp/test3").Output()
 			o.Expect(err).NotTo(o.HaveOccurred())
 		})
 	})
diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go
index 134a4f2dbab6..06a0b7b3de75 100644
--- a/test/extended/testdata/bindata.go
+++ b/test/extended/testdata/bindata.go
@@ -20361,7 +20361,7 @@ func testExtendedTestdataBuildsCustomBuildDockerfile() (*asset, error) {
 	return a, nil
 }
 
-var _testExtendedTestdataBuildsCustomBuildDockerfileSample = []byte(`FROM docker.io/centos:7
+var _testExtendedTestdataBuildsCustomBuildDockerfileSample = []byte(`FROM registry.access.redhat.com/ubi8/ubi-minimal
 RUN touch /tmp/built
 `)
 
@@ -24934,11 +24934,11 @@ apiVersion: v1
 metadata:
   name: doublecontainers
   labels:
-    name: hello-centos
+    name: hello-ubi
 spec:
   containers:
-  - name: hello-centos
-    image: docker.io/centos:centos7
+  - name: hello-ubi
+    image: registry.access.redhat.com/ubi8/ubi-minimal
     command:
       - /bin/sleep
       - infinity
@@ -24949,8 +24949,8 @@ spec:
     imagePullPolicy: IfNotPresent
     capabilities: {}
     securityContext: {}
-  - name: hello-centos-2
-    image: docker.io/centos:centos7
+  - name: hello-ubi-2
+    image: registry.access.redhat.com/ubi8/ubi-minimal
     command:
       - /bin/sleep
       - infinity
diff --git a/test/extended/testdata/builds/custom-build/Dockerfile.sample b/test/extended/testdata/builds/custom-build/Dockerfile.sample
index 86e4618f9d84..b5edc5c8012c 100644
--- a/test/extended/testdata/builds/custom-build/Dockerfile.sample
+++ b/test/extended/testdata/builds/custom-build/Dockerfile.sample
@@ -1,2 +1,2 @@
-FROM docker.io/centos:7
+FROM registry.access.redhat.com/ubi8/ubi-minimal
 RUN touch /tmp/built
diff --git a/test/extended/testdata/cli/pod-with-two-containers.yaml b/test/extended/testdata/cli/pod-with-two-containers.yaml
index 2f87ed72a0da..935e9c5ef7fb 100644
--- a/test/extended/testdata/cli/pod-with-two-containers.yaml
+++ b/test/extended/testdata/cli/pod-with-two-containers.yaml
@@ -3,11 +3,11 @@ apiVersion: v1
 metadata:
   name: doublecontainers
   labels:
-    name: hello-centos
+    name: hello-ubi
 spec:
   containers:
-  - name: hello-centos
-    image: docker.io/centos:centos7
+  - name: hello-ubi
+    image: registry.access.redhat.com/ubi8/ubi-minimal
     command:
       - /bin/sleep
       - infinity
@@ -18,8 +18,8 @@ spec:
     imagePullPolicy: IfNotPresent
     capabilities: {}
     securityContext: {}
-  - name: hello-centos-2
-    image: docker.io/centos:centos7
+  - name: hello-ubi-2
+    image: registry.access.redhat.com/ubi8/ubi-minimal
     command:
       - /bin/sleep
       - infinity