diff --git a/features/cli/build.feature b/features/cli/build.feature
index 982de89c28..c9375e6867 100644
--- a/features/cli/build.feature
+++ b/features/cli/build.feature
@@ -142,7 +142,7 @@ Feature: build 'apps' with CLI
     Given I create a new project
     When I run the :new_app client command with:
       | image_stream      | openshift/mysql                                      |
-      | image             | registry.access.redhat.com/rhscl/postgresql-96-rhel7 |
+      | image             | registry.redhat.io/rhel8/postgresql-12       |
       | env               | POSTGRESQL_USER=user                                 |
       | env               | POSTGRESQL_DATABASE=db                               |
       | env               | POSTGRESQL_PASSWORD=test                             |
@@ -160,7 +160,7 @@ Feature: build 'apps' with CLI
     Then the step should succeed
     """
     And the output should contain "mysql"
-    Given I wait for the "postgresql-96-rhel7" service to become ready up to 300 seconds
+    Given I wait for the "postgresql-12" service to become ready up to 300 seconds
     And I get the service pods
     And I wait up to 120 seconds for the steps to pass:
     """
diff --git a/testdata/build/ruby20rhel7-context-docker.json b/testdata/build/ruby20rhel7-context-docker.json
index f9fb6eb460..e4342b7a98 100644
--- a/testdata/build/ruby20rhel7-context-docker.json
+++ b/testdata/build/ruby20rhel7-context-docker.json
@@ -75,7 +75,7 @@
         "creationTimestamp": null
       },
       "spec": {
-        "dockerImageRepository": "registry.access.redhat.com/rhscl/ruby-22-rhel7"
+        "dockerImageRepository": "quay.io/openshifttest/ruby-27"
       },
       "status": {
         "dockerImageRepository": ""
@@ -116,7 +116,7 @@
         "source": {
           "type": "Git",
           "git": {
-            "uri": "https://github.com/openshift-qe/ruby-hello-world-context.git"
+            "uri": "https://github.com/openshift/ruby-hello-world"
           },
           "contextDir": "test"
         },
@@ -125,7 +125,7 @@
           "dockerStrategy": {
             "from": {
               "kind": "DockerImage",
-              "name": "registry.access.redhat.com/rhscl/ruby-22-rhel7:latest"
+              "name": "quay.io/openshifttest/ruby-27:multiarch"
             },
             "env": [
               {