diff --git a/README.md b/README.md
index 90fb5ed..f36f7dd 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,6 @@ OpenShift base images
 [![Build and push images to Quay.io registry](https://github.com/sclorg/s2i-base-container/actions/workflows/build-and-push.yml/badge.svg)](https://github.com/sclorg/s2i-base-container/actions/workflows/build-and-push.yml)
 
 Images available on Quay are:
-* CentOS 7 [s2i-core](https://quay.io/repository/centos7/s2i-core-centos7)
-* CentOS 7 [s2i-base](https://quay.io/repository/centos7/s2i-base-centos7)
 * CentOS Stream 9 [s2i-core](https://quay.io/repository/sclorg/s2i-core-c9s)
 * CentOS Stream 9 [s2i-base](https://quay.io/repository/sclorg/s2i-base-c9s)
 * Fedora [s2i-core](https://quay.io/repository/fedora/s2i-core)
@@ -16,16 +14,14 @@ This repository contains Dockerfiles which serve as base images for various Open
 Versions
 ---------------------------------
 s2i image versions currently provided are:
-* [core](core/README.md) - rhel7 base + s2i settings
+* [core](core/README.md) - rhel8 base + s2i settings
 * [base](base/README.md) - s2i-core + development libraries + npm
 
 RHEL versions currently supported are:
-* RHEL7
 * RHEL8
 * RHEL9
 
 CentOS versions currently supported are:
-* CentOS7
 * CentOS Stream 9
 
 For more information about contributing, see
@@ -36,19 +32,19 @@ For more information about concepts used in these container images, see the
 
 Installation
 ---------------
-To build a S2I base image, choose either the CentOS or RHEL based image:
+To build a S2I base image, choose either the CentOS Stream or RHEL based image:
 *  **RHEL based image**
 
     This image is available in Red Hat Container Registry. To download it run:
 
     ```
-    $ podman pull registry.access.redhat.com/rhscl/s2i-base-rhel7
+    $ podman pull registry.access.redhat.com/rhel8/s2i-base
     ```
 
     Or
 
     ```
-    $ podman pull registry.access.redhat.com/rhscl/s2i-core-rhel7
+    $ podman pull registry.access.redhat.com/rhel8/s2i-core
     ```
 
     To build a RHEL based S2I base image, you need to run the build on a properly
@@ -58,21 +54,21 @@ To build a S2I base image, choose either the CentOS or RHEL based image:
     $ git clone --recursive https://github.com/sclorg/s2i-base-container.git
     $ cd s2i-base-container
     $ git submodule update --init
-    $ make build TARGET=rhel7 VERSIONS=base
+    $ make build TARGET=rhel8 VERSIONS=base
     ```
 
-*  **CentOS based image**
+*  **CentOS Stream based image**
 
     This image is available on DockerHub. To download it run:
 
     ```
-    $ podman pull quay.io/centos7/s2i-base-centos7
+    $ podman pull quay.io/sclorg/s2i-base-c9s
     ```
 
     Or
 
     ```
-    $ podman pull quay.io/centos7/s2i-core-centos7
+    $ podman pull quay.io/sclorg/s2i-core-c9s
     ```
 
     To build a S2I base image from scratch run:
@@ -81,7 +77,7 @@ To build a S2I base image, choose either the CentOS or RHEL based image:
     $ git clone --recursive https://github.com/sclorg/s2i-base-container.git
     $ cd s2i-base-container
     $ git submodule update --init
-    $ make build TARGET=centos7 VERSIONS=base
+    $ make build TARGET=c9s VERSIONS=base
     ```
 
 Note: while the installation steps are calling `podman`, you can replace any such calls by `docker` with the same arguments.
diff --git a/base/.exclude-rhel7 b/base/.exclude-rhel7
new file mode 100644
index 0000000..e69de29
diff --git a/base/README.md b/base/README.md
index f40500f..8a901b0 100644
--- a/base/README.md
+++ b/base/README.md
@@ -67,23 +67,23 @@ Note: while the examples in this README are calling `podman`, you can replace an
 
 Usage
 ------------------------
-Choose either the CentOS7 or RHEL7 base image:
-*  **RHEL7 base image**
+Choose either the CentOS Stream or RHEL based image:
+*  **RHEL8 base image**
 
-To build a RHEL7 based image, you need to build it on properly subscribed RHEL machine.
+To build a RHEL8 based image, you need to build it on properly subscribed RHEL machine.
 
 ```
 $ git clone --recursive https://github.com/sclorg/s2i-base-container.git
 $ cd s2i-base-container
-$ make build VERSIONS=base TARGET=rhel7
+$ make build VERSIONS=base TARGET=rhel8
 ```
 
-*  **CentOS7 base image**
+*  **CentOS Stream 9 base image**
 
 This image is available on DockerHub. To download it run:
 
 ```console
-podman pull quay.io/centos7/s2i-base-centos7
+podman pull quay.io/sclorg/s2i-base-c9s
 ```
 
 To build a Base image from scratch run:
@@ -91,7 +91,7 @@ To build a Base image from scratch run:
 ```
 $ git clone --recursive https://github.com/sclorg/s2i-base-container.git
 $ cd s2i-base-container
-$ make build VERSIONS=base
+$ make build VERSIONS=base TARGET=c9s
 ```
 
 **Notice: By omitting the `VERSION` parameter, the build/test action will be performed
@@ -102,6 +102,5 @@ See also
 --------
 Dockerfile and other sources are available on https://github.com/sclorg/s2i-base-container.
 In that repository you also can find another variants of S2I base Dockerfiles.
-The Dockerfile for CentOS is called Dockerfile, the Dockerfile for RHEL7 is called Dockerfile.rhel7,
-the Dockerfile for RHEL8 is called Dockerfile.rhel8, the Dockerfile for RHEL9 is called Dockerfile.rhel9,
+The Dockerfile for RHEL8 is called Dockerfile.rhel8, the Dockerfile for RHEL9 is called Dockerfile.rhel9,
 the Dockerfile for CentOS Stream 9 is called Dockerfile.c9s and the Dockerfile for Fedora is Dockerfile.fedora.
diff --git a/core/.exclude-rhel7 b/core/.exclude-rhel7
new file mode 100644
index 0000000..e69de29
diff --git a/core/README.md b/core/README.md
index a16c3c7..2ec1939 100644
--- a/core/README.md
+++ b/core/README.md
@@ -48,23 +48,23 @@ Note: while the examples in this README are calling `podman`, you can replace an
 
 Usage
 ------------------------
-Choose either the CentOS7 or RHEL7 base image:
-*  **RHEL7 base image**
+Choose either the CentOS Stream or RHEL8 base image:
+*  **RHEL8 base image**
 
-To build a RHEL7 based image, you need to build it on properly subscribed RHEL machine.
+To build a RHEL8 based image, you need to build it on properly subscribed RHEL machine.
 
 ```
 $ git clone --recursive https://github.com/sclorg/s2i-base-container.git
 $ cd s2i-base-container
-$ make build VERSIONS=core TARGET=rhel7
+$ make build VERSIONS=core TARGET=rhel8
 ```
 
-*  **CentOS7 base image**
+*  **CentOS Stream base image**
 
 This image is available on Quay.io. To download it run:
 
 ```console
-podman pull quay.io/centos7/s2i-core-centos7
+podman pull quay.io/sclorg/s2i-core-c9s
 ```
 
 To build a Base image from scratch run:
@@ -72,7 +72,7 @@ To build a Base image from scratch run:
 ```
 $ git clone --recursive https://github.com/sclorg/s2i-base-container.git
 $ cd s2i-base-container
-$ make build VERSIONS=core
+$ make build VERSIONS=core TARGET=c9s
 ```
 
 **Notice: By omitting the `VERSION` parameter, the build/test action will be performed
@@ -83,6 +83,5 @@ See also
 --------
 Dockerfile and other sources are available on https://github.com/sclorg/s2i-base-container.
 In that repository you also can find another variants of S2I Base Dockerfiles.
-The Dockerfile for CentOS is called Dockerfile, the Dockerfile for RHEL7 is called Dockerfile.rhel7,
-the Dockerfile for RHEL8 is called Dockerfile.rhel8, the Dockerfile for RHEL9 is called Dockerfile.rhel9,
+The Dockerfile for RHEL8 is called Dockerfile.rhel8, the Dockerfile for RHEL9 is called Dockerfile.rhel9,
 the Dockerfile for CentOS Stream 9 is called Dockerfile.c9s and the Dockerfile for Fedora is Dockerfile.fedora.