diff --git a/24-minimal/.exclude-rhel10 b/24-minimal/.exclude-rhel10
deleted file mode 100644
index e69de29b..00000000
diff --git a/24-minimal/.exclude-rhel9 b/24-minimal/.exclude-rhel9
deleted file mode 100644
index e69de29b..00000000
diff --git a/24-minimal/Dockerfile.c10s b/24-minimal/Dockerfile.c10s
index ac0e602f..1e36021e 100644
--- a/24-minimal/Dockerfile.c10s
+++ b/24-minimal/Dockerfile.c10s
@@ -49,7 +49,7 @@ LABEL summary="$SUMMARY" \
       help="For more information visit https://github.com/sclorg/s2i-nodejs-container"
 
 # nodejs-full-i18n is included for error strings
-RUN INSTALL_PKGS="nodejs$NODEJS_VERSION nodejs-nodemon nodejs$NODEJS_VERSION-full-i18n npm findutils tar which" && \
+RUN INSTALL_PKGS="nodejs$NODEJS_VERSION nodejs-nodemon nodejs$NODEJS_VERSION-full-i18n nodejs$NODEJS_VERSION-npm findutils tar which" && \
     dnf -y --nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \
     node-24 -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \
     dnf clean all && \
diff --git a/24-minimal/Dockerfile.fedora b/24-minimal/Dockerfile.fedora
index 0bafeebd..aff5ae90 100644
--- a/24-minimal/Dockerfile.fedora
+++ b/24-minimal/Dockerfile.fedora
@@ -49,7 +49,7 @@ LABEL summary="$SUMMARY" \
       help="For more information visit https://github.com/sclorg/s2i-nodejs-container"
 
 # nodejs-full-i18n is included for error strings
-RUN INSTALL_PKGS="nodejs$NODEJS_VERSION nodejs-nodemon nodejs$NODEJS_VERSION-full-i18n nodejs$NODEJS_VERSION-npm findutils tar which nss_wrapper-libs" && \
+RUN INSTALL_PKGS="nodejs$NODEJS_VERSION nodejs-nodemon nodejs$NODEJS_VERSION-full-i18n nodejs$NODEJS_VERSION-npm findutils tar which" && \
     microdnf -y --nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \
     microdnf clean all && \
     ln -s /usr/bin/node-$NODEJS_VERSION /usr/bin/node && \
diff --git a/24-minimal/Dockerfile.rhel10 b/24-minimal/Dockerfile.rhel10
index a23134fe..5a2d9883 100644
--- a/24-minimal/Dockerfile.rhel10
+++ b/24-minimal/Dockerfile.rhel10
@@ -50,7 +50,7 @@ LABEL summary="$SUMMARY" \
       help="For more information visit https://github.com/sclorg/s2i-nodejs-container"
 
 # nodejs-full-i18n is included for error strings
-RUN INSTALL_PKGS="nodejs nodejs-nodemon nodejs-full-i18n npm findutils tar which" && \
+RUN INSTALL_PKGS="nodejs$NODEJS_VERSION nodejs-nodemon nodejs$NODEJS_VERSION-full-i18n nodejs$NODEJS_VERSION-npm findutils tar which" && \
     microdnf -y --nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \
     node -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \
     microdnf clean all && \
diff --git a/24/.exclude-rhel10 b/24/.exclude-rhel10
deleted file mode 100644
index e69de29b..00000000
diff --git a/24/.exclude-rhel9 b/24/.exclude-rhel9
deleted file mode 100644
index e69de29b..00000000
diff --git a/24/Dockerfile.c10s b/24/Dockerfile.c10s
index 53cb44e1..a1b42171 100644
--- a/24/Dockerfile.c10s
+++ b/24/Dockerfile.c10s
@@ -54,7 +54,7 @@ LABEL summary="$SUMMARY" \
       usage="s2i build <SOURCE-REPOSITORY> quay.io/sclorg/$NAME-$NODEJS_VERSION-c10s:latest <APP-NAME>"
 
 # Package libatomic_ops was removed
-RUN INSTALL_PKGS="make gcc gcc-c++ git openssl-devel nodejs nodejs-nodemon nodejs-npm nss_wrapper-libs which" && \
+RUN INSTALL_PKGS="make gcc gcc-c++ git openssl-devel nodejs$NODEJS_VERSION nodejs-nodemon nodejs$NODEJS_VERSION-npm nss_wrapper-libs which" && \
     dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     rm /usr/bin/node && ln -s /usr/bin/node-$NODEJS_VERSION /usr/bin/node && \
diff --git a/24/Dockerfile.rhel10 b/24/Dockerfile.rhel10
index 77f775f4..55ebda34 100644
--- a/24/Dockerfile.rhel10
+++ b/24/Dockerfile.rhel10
@@ -54,7 +54,7 @@ LABEL summary="$SUMMARY" \
       usage="s2i build <SOURCE-REPOSITORY> ubi10/$NAME-$NODEJS_VERSION <APP-NAME>"
 
 # Package libatomic_ops was removed
-RUN INSTALL_PKGS="make gcc gcc-c++ git openssl-devel nodejs nodejs-nodemon nodejs-npm nss_wrapper-libs which" && \
+RUN INSTALL_PKGS="make gcc gcc-c++ git openssl-devel nodejs$NODEJS_VERSION nodejs-nodemon nodejs$NODEJS_VERSION-npm nss_wrapper-libs which" && \
     dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     rm /usr/bin/node && ln -s /usr/bin/node-$NODEJS_VERSION /usr/bin/node && \