diff --git a/api/v1beta1/common_webhook.go b/api/v1beta1/common_webhook.go
index 68a55012..a6141834 100644
--- a/api/v1beta1/common_webhook.go
+++ b/api/v1beta1/common_webhook.go
@@ -82,10 +82,10 @@ const (
 )
 
 const (
-	DefaultTempestContainerImageURL     = "quay.io/podified-antelope-centos9/openstack-tempest-all:current-podified"
-	DefaultTobikoContainerImageURL      = "quay.io/podified-antelope-centos9/openstack-tobiko:current-podified"
-	DefaultAnsibleTestContainerImageURL = "quay.io/podified-antelope-centos9/openstack-ansible-tests:current-podified"
-	DefaultHorizonTestContainerImageURL = "quay.io/podified-antelope-centos9/openstack-horizontest:current-podified"
+	DefaultTempestContainerImageURL     = "quay.io/openstack-s2i-containers/openstack-tempest:master-latest"
+	DefaultTobikoContainerImageURL      = "quay.io/openstack-s2i-containers/openstack-tobiko:master-latest"
+	DefaultAnsibleTestContainerImageURL = "quay.io/openstack-s2i-containers/openstack-ansible-test:master-latest"
+	DefaultHorizonTestContainerImageURL = "quay.io/openstack-s2i-containers/openstack-horizontest:master-latest"
 )
 
 // SetupDefaults - initializes any CRD field defaults based on environment variables (the defaulting mechanism itself is implemented via webhooks)
diff --git a/config/default/manager_default_images.yaml b/config/default/manager_default_images.yaml
index d2de8117..eb286083 100644
--- a/config/default/manager_default_images.yaml
+++ b/config/default/manager_default_images.yaml
@@ -12,10 +12,10 @@ spec:
       - name: manager
         env:
         - name: RELATED_IMAGE_TEST_TEMPEST_IMAGE_URL_DEFAULT
-          value: quay.io/podified-antelope-centos9/openstack-tempest-all:current-podified
+          value: quay.io/openstack-s2i-containers/openstack-tempest:master-latest
         - name: RELATED_IMAGE_TEST_TOBIKO_IMAGE_URL_DEFAULT
-          value: quay.io/podified-antelope-centos9/openstack-tobiko:current-podified
+          value: quay.io/openstack-s2i-containers/openstack-tobiko:master-latest
         - name: RELATED_IMAGE_TEST_ANSIBLETEST_IMAGE_URL_DEFAULT
-          value: quay.io/podified-antelope-centos9/openstack-ansible-tests:current-podified
+          value: quay.io/openstack-s2i-containers/openstack-ansible-test:master-latest
         - name: RELATED_IMAGE_TEST_HORIZONTEST_IMAGE_URL_DEFAULT
-          value: quay.io/podified-antelope-centos9/openstack-horizontest:current-podified
+          value: quay.io/openstack-s2i-containers/openstack-horizontest:master-latest
diff --git a/hack/export_related_images.sh b/hack/export_related_images.sh
index c51d7238..b6b24499 100755
--- a/hack/export_related_images.sh
+++ b/hack/export_related_images.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export RELATED_IMAGE_TEST_TEMPEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-tempest-all:current-podified
-export RELATED_IMAGE_TEST_TOBIKO_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-tobiko:current-podified
-export RELATED_IMAGE_TEST_ANSIBLETEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ansible-tests:current-podified
-export RELATED_IMAGE_TEST_HORIZONTEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-horizontest:current-podified
+export RELATED_IMAGE_TEST_TEMPEST_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-tempest:master-latest
+export RELATED_IMAGE_TEST_TOBIKO_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-tobiko:master-latest
+export RELATED_IMAGE_TEST_ANSIBLETEST_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-ansible-test:master-latest
+export RELATED_IMAGE_TEST_HORIZONTEST_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-horizontest:master-latest
diff --git a/test/functional/base_test.go b/test/functional/base_test.go
index c7d15cdf..654eb1db 100644
--- a/test/functional/base_test.go
+++ b/test/functional/base_test.go
@@ -92,10 +92,10 @@ func CreateTestOperatorConfigMap(namespace string) *corev1.ConfigMap {
 			Namespace: namespace,
 		},
 		Data: map[string]string{
-			"ansibletest-image": "quay.io/podified-antelope-centos9/openstack-ansibletest:current-podified",
-			"horizontest-image": "quay.io/podified-antelope-centos9/openstack-horizontest:current-podified",
-			"tempest-image":     "quay.io/podified-antelope-centos9/openstack-tempest:current-podified",
-			"tobiko-image":      "quay.io/podified-antelope-centos9/openstack-tobiko:current-podified",
+			"ansibletest-image": "quay.io/openstack-s2i-containers/openstack-ansible-test:master-latest",
+			"horizontest-image": "quay.io/openstack-s2i-containers/openstack-horizontest:master-latest",
+			"tempest-image":     "quay.io/openstack-s2i-containers/openstack-tempest:master-latest",
+			"tobiko-image":      "quay.io/openstack-s2i-containers/openstack-tobiko:master-latest",
 		},
 	}
 }