diff --git a/18/Dockerfile.rhel8 b/18/Dockerfile.rhel8
index ff9f41c3..41073b30 100644
--- a/18/Dockerfile.rhel8
+++ b/18/Dockerfile.rhel8
@@ -1,4 +1,4 @@
-FROM ubi8/s2i-core:1
+FROM ubi8/s2i-core:latest
 
 # This image provides a Node.JS environment you can use to run your Node.JS
 # applications.
diff --git a/18/Dockerfile.rhel9 b/18/Dockerfile.rhel9
index d243fdf3..8e865cd3 100644
--- a/18/Dockerfile.rhel9
+++ b/18/Dockerfile.rhel9
@@ -1,4 +1,4 @@
-FROM ubi9/s2i-core:1
+FROM ubi9/s2i-core:latest
 
 # This image provides a Node.JS environment you can use to run your Node.JS
 # applications.
diff --git a/20-minimal/Dockerfile.c9s b/20-minimal/Dockerfile.c9s
index 8d3ce96c..f0eebe2d 100644
--- a/20-minimal/Dockerfile.c9s
+++ b/20-minimal/Dockerfile.c9s
@@ -1,4 +1,4 @@
-FROM quay.io/sclorg/s2i-core-c9s
+FROM quay.io/centos/centos:stream9-minimal
 
 EXPOSE 8080
 
diff --git a/20/Dockerfile.rhel8 b/20/Dockerfile.rhel8
index cfea99fe..6f620c76 100644
--- a/20/Dockerfile.rhel8
+++ b/20/Dockerfile.rhel8
@@ -1,4 +1,4 @@
-FROM ubi8/s2i-core:1
+FROM ubi8/s2i-core:latest
 
 # This image provides a Node.JS environment you can use to run your Node.JS
 # applications.
diff --git a/20/Dockerfile.rhel9 b/20/Dockerfile.rhel9
index 1aff401a..74a5f7ee 100644
--- a/20/Dockerfile.rhel9
+++ b/20/Dockerfile.rhel9
@@ -1,4 +1,4 @@
-FROM ubi9/s2i-core:1
+FROM ubi9/s2i-core:latest
 
 # This image provides a Node.JS environment you can use to run your Node.JS
 # applications.
diff --git a/22-minimal/Dockerfile.c10s b/22-minimal/Dockerfile.c10s
index b558a0ba..c63e79f1 100644
--- a/22-minimal/Dockerfile.c10s
+++ b/22-minimal/Dockerfile.c10s
@@ -1,4 +1,4 @@
-FROM quay.io/sclorg/s2i-core-c10s
+FROM quay.io/centos/centos:stream10-minimal
 
 EXPOSE 8080
 
diff --git a/22-minimal/Dockerfile.c9s b/22-minimal/Dockerfile.c9s
index 92275fbe..8d1d2c0b 100644
--- a/22-minimal/Dockerfile.c9s
+++ b/22-minimal/Dockerfile.c9s
@@ -1,4 +1,4 @@
-FROM quay.io/sclorg/s2i-core-c9s
+FROM quay.io/centos/centos:stream9-minimal
 
 EXPOSE 8080
 
diff --git a/22/Dockerfile.rhel8 b/22/Dockerfile.rhel8
index 1156ca11..cca2a4e4 100644
--- a/22/Dockerfile.rhel8
+++ b/22/Dockerfile.rhel8
@@ -1,4 +1,4 @@
-FROM ubi8/s2i-core:1
+FROM ubi8/s2i-core:latest
 
 # This image provides a Node.JS environment you can use to run your Node.JS
 # applications.
diff --git a/22/Dockerfile.rhel9 b/22/Dockerfile.rhel9
index c6c4a1e6..5a7097e8 100644
--- a/22/Dockerfile.rhel9
+++ b/22/Dockerfile.rhel9
@@ -1,4 +1,4 @@
-FROM ubi9/s2i-core:1
+FROM ubi9/s2i-core:latest
 
 # This image provides a Node.JS environment you can use to run your Node.JS
 # applications.
diff --git a/24-minimal/Dockerfile.c10s b/24-minimal/Dockerfile.c10s
index 4b111926..e4b6ef3f 100644
--- a/24-minimal/Dockerfile.c10s
+++ b/24-minimal/Dockerfile.c10s
@@ -1,4 +1,4 @@
-FROM quay.io/sclorg/s2i-core-c10s
+FROM quay.io/centos/centos:stream10-minimal
 
 EXPOSE 8080
 
diff --git a/24-minimal/Dockerfile.c9s b/24-minimal/Dockerfile.c9s
index 37aa5e8e..9b7f6489 100644
--- a/24-minimal/Dockerfile.c9s
+++ b/24-minimal/Dockerfile.c9s
@@ -1,4 +1,4 @@
-FROM quay.io/sclorg/s2i-core-c9s
+FROM quay.io/centos/centos:stream9-minimal
 
 EXPOSE 8080
 
diff --git a/24/Dockerfile.rhel8 b/24/Dockerfile.rhel8
index aa3026c5..d5cc39de 100644
--- a/24/Dockerfile.rhel8
+++ b/24/Dockerfile.rhel8
@@ -1,4 +1,4 @@
-FROM ubi8/s2i-core:1
+FROM ubi8/s2i-core:latest
 
 # This image provides a Node.JS environment you can use to run your Node.JS
 # applications.
diff --git a/24/Dockerfile.rhel9 b/24/Dockerfile.rhel9
index bbdb9f51..74202d63 100644
--- a/24/Dockerfile.rhel9
+++ b/24/Dockerfile.rhel9
@@ -1,4 +1,4 @@
-FROM ubi9/s2i-core:1
+FROM ubi9/s2i-core:latest
 
 # This image provides a Node.JS environment you can use to run your Node.JS
 # applications.