diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go
index 8d14e8496114..d2b0a22c5835 100644
--- a/test/extended/testdata/bindata.go
+++ b/test/extended/testdata/bindata.go
@@ -17206,7 +17206,7 @@ items:
       sourceStrategy:
         from:
           kind: DockerImage
-          name: quay.io/redhat-developer/test-build-simples2i:latest
+          name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
     resources: {}
     postCommit: {}
     nodeSelector: null
@@ -18290,7 +18290,7 @@ var _testExtendedTestdataBuildsBuildTimingTestS2iBuildJson = []byte(`{
       "sourceStrategy": {
         "from": {
           "kind": "DockerImage",
-          "name": "quay.io/redhat-developer/test-build-simples2i:latest"
+          "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
         },
         "env": [
           {
@@ -18836,7 +18836,7 @@ spec:
     sourceStrategy:
       from:
         kind: DockerImage
-        name: quay.io/redhat-developer/test-build-simples2i:latest
+        name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
 `)
 
 func testExtendedTestdataBuildsStatusfailFailedassembleYamlBytes() ([]byte, error) {
@@ -19071,7 +19071,7 @@ spec:
     sourceStrategy:
       from:
         kind: DockerImage
-        name: quay.io/redhat-developer/test-build-simples2i:latest
+        name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
     type: Source
 `)
 
@@ -19107,7 +19107,7 @@ spec:
     sourceStrategy:
       from:
         kind: DockerImage
-        name: quay.io/redhat-developer/test-build-simples2i:latest
+        name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
     type: Source
 `)
 
@@ -19336,7 +19336,7 @@ items:
       sourceStrategy:
         from:
           kind: DockerImage
-          name: quay.io/redhat-developer/test-build-simples2i:latest
+          name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
       type: Source
 - apiVersion: build.openshift.io/v1
   kind: BuildConfig
@@ -19354,7 +19354,7 @@ items:
           value: "5"
         from:
           kind: DockerImage
-          name: quay.io/redhat-developer/test-build-simples2i:latest
+          name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
       type: Source
 `)
 
@@ -19483,7 +19483,7 @@ items:
           value: 127.0.0.1:3128
         from:
           kind: DockerImage
-          name: quay.io/redhat-developer/test-build-simples2i:latest
+          name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
 - kind: BuildConfig
   apiVersion: v1
   metadata:
@@ -19505,7 +19505,7 @@ items:
       sourceStrategy:
         from:
           kind: DockerImage
-          name: quay.io/redhat-developer/test-build-simples2i:latest
+          name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
         env:
         - name: SOME_HTTP_PROXY
           value: https://envuser:password@proxy3.com
@@ -19595,7 +19595,7 @@ var _testExtendedTestdataBuildsTestBuildRevisionJson = []byte(`{
           "sourceStrategy": {
             "from": {
               "kind": "DockerImage",
-              "name": "quay.io/redhat-developer/test-build-simples2i:latest"
+              "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
             }
           }
         },
@@ -21072,7 +21072,7 @@ var _testExtendedTestdataBuildsTestNosrcBuildJson = []byte(`{
           "sourceStrategy": {
             "from": {
               "kind": "DockerImage",
-              "name": "quay.io/redhat-developer/test-build-simples2i:latest"
+              "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
             }
           }
         }
@@ -21123,8 +21123,8 @@ var _testExtendedTestdataBuildsTestS2iBuildQuotaJson = []byte(`{
       "type": "Source",
       "sourceStrategy": {
         "from": {
-          "kind":"DockerImage",
-          "name":"quay.io/redhat-developer/test-build-simples2i:latest"
+          "kind": "DockerImage",
+          "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
         },
         "env": [
           {
@@ -21181,7 +21181,7 @@ var _testExtendedTestdataBuildsTestS2iBuildJson = []byte(`{
         ],
         "from": {
           "kind": "DockerImage",
-          "name": "quay.io/redhat-developer/test-build-simples2i:latest"
+          "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
         }
       }
     },
@@ -21252,7 +21252,7 @@ var _testExtendedTestdataBuildsTestS2iNoOutputnameJson = []byte(`{
         ],
         "from": {
           "kind": "DockerImage",
-          "name": "quay.io/redhat-developer/test-build-simples2i:latest"
+          "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
         }
       }
     }
@@ -21398,7 +21398,7 @@ spec:
     sourceStrategy:
       from:
         kind: DockerImage
-        name: quay.io/redhat-developer/test-build-simples2i:latest
+        name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
       env:
         - name: BUILD_LOGLEVEL
           value: "5"
@@ -21534,7 +21534,7 @@ spec:
     sourceStrategy:
       from:
         kind: DockerImage
-        name: quay.io/redhat-developer/test-build-simples2i:latest
+        name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
       env:
         - name: BUILD_LOGLEVEL
           value: "5"
@@ -52368,7 +52368,7 @@ objects:
       sourceStrategy:
         from:
           kind: DockerImage
-          name: quay.io/redhat-developer/test-build-simples2i:latest
+          name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
     output:
       to:
         kind: ImageStreamTag
diff --git a/test/extended/testdata/builds/build-postcommit/sti.yaml b/test/extended/testdata/builds/build-postcommit/sti.yaml
index c610926b543c..6ec3485f8316 100644
--- a/test/extended/testdata/builds/build-postcommit/sti.yaml
+++ b/test/extended/testdata/builds/build-postcommit/sti.yaml
@@ -20,7 +20,7 @@ items:
       sourceStrategy:
         from:
           kind: DockerImage
-          name: quay.io/redhat-developer/test-build-simples2i:latest
+          name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
     resources: {}
     postCommit: {}
     nodeSelector: null
diff --git a/test/extended/testdata/builds/build-timing/test-s2i-build.json b/test/extended/testdata/builds/build-timing/test-s2i-build.json
index 7856d9889143..2a926ba57967 100644
--- a/test/extended/testdata/builds/build-timing/test-s2i-build.json
+++ b/test/extended/testdata/builds/build-timing/test-s2i-build.json
@@ -18,7 +18,7 @@
       "sourceStrategy": {
         "from": {
           "kind": "DockerImage",
-          "name": "quay.io/redhat-developer/test-build-simples2i:latest"
+          "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
         },
         "env": [
           {
diff --git a/test/extended/testdata/builds/statusfail-failedassemble.yaml b/test/extended/testdata/builds/statusfail-failedassemble.yaml
index 67d5a5709ec2..08d44a82fa59 100644
--- a/test/extended/testdata/builds/statusfail-failedassemble.yaml
+++ b/test/extended/testdata/builds/statusfail-failedassemble.yaml
@@ -10,4 +10,4 @@ spec:
     sourceStrategy:
       from:
         kind: DockerImage
-        name: quay.io/redhat-developer/test-build-simples2i:latest
+        name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
diff --git a/test/extended/testdata/builds/statusfail-postcommithook.yaml b/test/extended/testdata/builds/statusfail-postcommithook.yaml
index d1ecb5a49e13..3e70a038e811 100644
--- a/test/extended/testdata/builds/statusfail-postcommithook.yaml
+++ b/test/extended/testdata/builds/statusfail-postcommithook.yaml
@@ -13,5 +13,5 @@ spec:
     sourceStrategy:
       from:
         kind: DockerImage
-        name: quay.io/redhat-developer/test-build-simples2i:latest
+        name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
     type: Source
diff --git a/test/extended/testdata/builds/statusfail-pushtoregistry.yaml b/test/extended/testdata/builds/statusfail-pushtoregistry.yaml
index 70b367beb4db..0be73d354db5 100644
--- a/test/extended/testdata/builds/statusfail-pushtoregistry.yaml
+++ b/test/extended/testdata/builds/statusfail-pushtoregistry.yaml
@@ -15,5 +15,5 @@ spec:
     sourceStrategy:
       from:
         kind: DockerImage
-        name: quay.io/redhat-developer/test-build-simples2i:latest
+        name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
     type: Source
diff --git a/test/extended/testdata/builds/test-build-cluster-config.yaml b/test/extended/testdata/builds/test-build-cluster-config.yaml
index 45aa7e0ec6bd..13234d1ba10a 100644
--- a/test/extended/testdata/builds/test-build-cluster-config.yaml
+++ b/test/extended/testdata/builds/test-build-cluster-config.yaml
@@ -15,7 +15,7 @@ items:
       sourceStrategy:
         from:
           kind: DockerImage
-          name: quay.io/redhat-developer/test-build-simples2i:latest
+          name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
       type: Source
 - apiVersion: build.openshift.io/v1
   kind: BuildConfig
@@ -33,5 +33,5 @@ items:
           value: "5"
         from:
           kind: DockerImage
-          name: quay.io/redhat-developer/test-build-simples2i:latest
+          name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
       type: Source
diff --git a/test/extended/testdata/builds/test-build-proxy.yaml b/test/extended/testdata/builds/test-build-proxy.yaml
index e556e572e402..60ad41145257 100644
--- a/test/extended/testdata/builds/test-build-proxy.yaml
+++ b/test/extended/testdata/builds/test-build-proxy.yaml
@@ -35,7 +35,7 @@ items:
           value: 127.0.0.1:3128
         from:
           kind: DockerImage
-          name: quay.io/redhat-developer/test-build-simples2i:latest
+          name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
 - kind: BuildConfig
   apiVersion: v1
   metadata:
@@ -57,7 +57,7 @@ items:
       sourceStrategy:
         from:
           kind: DockerImage
-          name: quay.io/redhat-developer/test-build-simples2i:latest
+          name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
         env:
         - name: SOME_HTTP_PROXY
           value: https://envuser:password@proxy3.com
diff --git a/test/extended/testdata/builds/test-build-revision.json b/test/extended/testdata/builds/test-build-revision.json
index 299172caa17c..5ff09e28ba82 100644
--- a/test/extended/testdata/builds/test-build-revision.json
+++ b/test/extended/testdata/builds/test-build-revision.json
@@ -22,7 +22,7 @@
           "sourceStrategy": {
             "from": {
               "kind": "DockerImage",
-              "name": "quay.io/redhat-developer/test-build-simples2i:latest"
+              "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
             }
           }
         },
diff --git a/test/extended/testdata/builds/test-nosrc-build.json b/test/extended/testdata/builds/test-nosrc-build.json
index 5b5a7fa929c0..3382b2bcecee 100644
--- a/test/extended/testdata/builds/test-nosrc-build.json
+++ b/test/extended/testdata/builds/test-nosrc-build.json
@@ -32,7 +32,7 @@
           "sourceStrategy": {
             "from": {
               "kind": "DockerImage",
-              "name": "quay.io/redhat-developer/test-build-simples2i:latest"
+              "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
             }
           }
         }
diff --git a/test/extended/testdata/builds/test-s2i-build-quota.json b/test/extended/testdata/builds/test-s2i-build-quota.json
index 9b5020646c5f..fa9ce821e068 100644
--- a/test/extended/testdata/builds/test-s2i-build-quota.json
+++ b/test/extended/testdata/builds/test-s2i-build-quota.json
@@ -24,8 +24,8 @@
       "type": "Source",
       "sourceStrategy": {
         "from": {
-          "kind":"DockerImage",
-          "name":"quay.io/redhat-developer/test-build-simples2i:latest"
+          "kind": "DockerImage",
+          "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
         },
         "env": [
           {
diff --git a/test/extended/testdata/builds/test-s2i-build.json b/test/extended/testdata/builds/test-s2i-build.json
index 332348f84816..d485c955eb90 100644
--- a/test/extended/testdata/builds/test-s2i-build.json
+++ b/test/extended/testdata/builds/test-s2i-build.json
@@ -26,7 +26,7 @@
         ],
         "from": {
           "kind": "DockerImage",
-          "name": "quay.io/redhat-developer/test-build-simples2i:latest"
+          "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
         }
       }
     },
diff --git a/test/extended/testdata/builds/test-s2i-no-outputname.json b/test/extended/testdata/builds/test-s2i-no-outputname.json
index 5038500d4323..259e1283960b 100644
--- a/test/extended/testdata/builds/test-s2i-no-outputname.json
+++ b/test/extended/testdata/builds/test-s2i-no-outputname.json
@@ -26,7 +26,7 @@
         ],
         "from": {
           "kind": "DockerImage",
-          "name": "quay.io/redhat-developer/test-build-simples2i:latest"
+          "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
         }
       }
     }
diff --git a/test/extended/testdata/builds/valuefrom/failed-sti-build-value-from-config.yaml b/test/extended/testdata/builds/valuefrom/failed-sti-build-value-from-config.yaml
index 54a5f4ae7d7a..1662a946b145 100644
--- a/test/extended/testdata/builds/valuefrom/failed-sti-build-value-from-config.yaml
+++ b/test/extended/testdata/builds/valuefrom/failed-sti-build-value-from-config.yaml
@@ -16,7 +16,7 @@ spec:
     sourceStrategy:
       from:
         kind: DockerImage
-        name: quay.io/redhat-developer/test-build-simples2i:latest
+        name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
       env:
         - name: BUILD_LOGLEVEL
           value: "5"
diff --git a/test/extended/testdata/builds/valuefrom/successful-sti-build-value-from-config.yaml b/test/extended/testdata/builds/valuefrom/successful-sti-build-value-from-config.yaml
index 901811b8a11d..b2eca21b7e46 100644
--- a/test/extended/testdata/builds/valuefrom/successful-sti-build-value-from-config.yaml
+++ b/test/extended/testdata/builds/valuefrom/successful-sti-build-value-from-config.yaml
@@ -16,7 +16,7 @@ spec:
     sourceStrategy:
       from:
         kind: DockerImage
-        name: quay.io/redhat-developer/test-build-simples2i:latest
+        name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
       env:
         - name: BUILD_LOGLEVEL
           value: "5"
diff --git a/test/extended/testdata/templates/templateinstance_readiness.yaml b/test/extended/testdata/templates/templateinstance_readiness.yaml
index dd437afd6655..515b163a0153 100644
--- a/test/extended/testdata/templates/templateinstance_readiness.yaml
+++ b/test/extended/testdata/templates/templateinstance_readiness.yaml
@@ -49,7 +49,7 @@ objects:
       sourceStrategy:
         from:
           kind: DockerImage
-          name: quay.io/redhat-developer/test-build-simples2i:latest
+          name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
     output:
       to:
         kind: ImageStreamTag