diff --git a/README.md b/README.md
index 4debae8..06af023 100644
--- a/README.md
+++ b/README.md
@@ -33,16 +33,16 @@ Note the following images are deprecated and will only receive a last update for
 
 The images are tagged with the format `ghcr.io/graalvm/IMAGE_NAME:java_version`.
 The version tag defines the level of specificity.
-It is recommended that the most specific tag be used, for example, `20.0.1` or `20.0.1-ol9-date`, where the `` means the image required a patch and this specific build will never change.
+It is recommended that the most specific tag be used, for example, `21.0.0` or `21.0.0-ol9-date`, where the `` means the image required a patch and this specific build will never change.
 
 You can pull a package by name or by name and version tag.
 To install GraalVM JDK from the command line, use:
 ```
-$ docker pull ghcr.io/graalvm/jdk-community:20.0.1
+$ docker pull ghcr.io/graalvm/jdk-community:21.0.0
 ```
 To use GraalVM JDK as base image in Dockerfile, use:
 ```
-FROM ghcr.io/graalvm/jdk-community:20.0.1
+FROM ghcr.io/graalvm/jdk-community:21.0.0
 ```
 
 Read more about GraalVM Community Edition container images [here](https://www.graalvm.org/docs/getting-started/container-images/).
@@ -57,9 +57,9 @@ For an RPM-based image, use:
 ghcr.io/graalvm/$IMAGE_NAME[:][$java_version][-$os_version][-$version][-$date]
 ```
 
-For example, `ghcr.io/graalvm/jdk-community:20.0.1-ol9-20230613`.
+For example, `ghcr.io/graalvm/jdk-community:21.0.0-ol9-20230919`.
 You can also set an image to a specific java version that allows an update for a subversion to be pulled.
-For instance, using `ghcr.io/graalvm/jdk-community:latest`, the image will be updated for 23.0.x releases, but not for 23.0.0.   
+For instance, using `ghcr.io/graalvm/jdk-community:latest`, the image will be updated for 23.1.x releases, but not for 23.1.0.   
 Using `ghcr.io/graalvm/native-image-community` you will always get the latest update available for Native Image community, the latest OS which is for now Oracle Linux 9 and Oracle Linux 9 slim, and the latest Java version.
 
 For Standalone-based image, use:
@@ -67,9 +67,9 @@ For Standalone-based image, use:
 ghcr.io/graalvm/$IMAGE_NAME[:][$graalvm_version][-$os_version][-$date]
 ```
 
-For example, `ghcr.io/graalvm/graalvm-community:23.0.0-ol9-20230622`.
+For example, `ghcr.io/graalvm/graalvm-community:23.1.0-ol9-20230919`.
 You can also set an image to a specific java version number that allows an update for a subversion to be pulled.
-For instance, using `ghcr.io/graalvm/nodejs-community:latest`, the image will be updated for 23.0.x releases, but not for 23.0.0.
+For instance, using `ghcr.io/graalvm/nodejs-community:latest`, the image will be updated for 23.1.x releases, but not for 23.1.0.
 Using `ghcr.io/graalvm/nodejs-community` you will always get the latest update available for Node.js, the latest OS which is for now Oracle Linux 9 and Oracle Linux 9 slim, and the latest Java version.
 
 Note some terms and restrictions that may apply to the open source technology.
diff --git a/graalpy-community/Dockerfile.debian b/graalpy-community/Dockerfile.debian
index 4bff28e..da41dd4 100644
--- a/graalpy-community/Dockerfile.debian
+++ b/graalpy-community/Dockerfile.debian
@@ -14,7 +14,7 @@ LABEL \
     org.opencontainers.image.authors='GraalVM Sustaining Team <graalvm-sustaining_ww_grp@oracle.com>' \
     org.opencontainers.image.description='GraalPy is the GraalVM high-performance implementation of the Python programming language.'
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG GRAALVM_PKG=https://github.com/oracle/graalpy/releases/download/vm-$GRAALVM_VERSION/graalpy-$GRAALVM_VERSION-linux-amd64.tar.gz
 
 WORKDIR /app
diff --git a/graalpy-community/Dockerfile.ol7 b/graalpy-community/Dockerfile.ol7
index bc220f2..75ea6b8 100644
--- a/graalpy-community/Dockerfile.ol7
+++ b/graalpy-community/Dockerfile.ol7
@@ -13,7 +13,7 @@ LABEL \
     org.opencontainers.image.authors='GraalVM Sustaining Team <graalvm-sustaining_ww_grp@oracle.com>' \
     org.opencontainers.image.description='GraalPy is the GraalVM high-performance implementation of the Python programming language.'
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG GRAALVM_PKG=https://github.com/oracle/graalpy/releases/download/vm-$GRAALVM_VERSION/graalpy-$GRAALVM_VERSION-linux-amd64.tar.gz
 ARG TEMP_REGION=""
 
diff --git a/graalpy-community/Dockerfile.ol7-slim b/graalpy-community/Dockerfile.ol7-slim
index 37fcf4b..fb96d09 100644
--- a/graalpy-community/Dockerfile.ol7-slim
+++ b/graalpy-community/Dockerfile.ol7-slim
@@ -14,7 +14,7 @@ LABEL \
     org.opencontainers.image.authors='GraalVM Sustaining Team <graalvm-sustaining_ww_grp@oracle.com>' \
     org.opencontainers.image.description='GraalPy is the GraalVM high-performance implementation of the Python programming language.'
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG GRAALVM_PKG=https://github.com/oracle/graalpy/releases/download/vm-$GRAALVM_VERSION/graalpy-$GRAALVM_VERSION-linux-amd64.tar.gz
 ARG TEMP_REGION=""
 
diff --git a/graalpy-community/Dockerfile.ol8 b/graalpy-community/Dockerfile.ol8
index 797dd1a..cc6e89e 100644
--- a/graalpy-community/Dockerfile.ol8
+++ b/graalpy-community/Dockerfile.ol8
@@ -14,7 +14,7 @@ LABEL \
     org.opencontainers.image.authors='GraalVM Sustaining Team <graalvm-sustaining_ww_grp@oracle.com>' \
     org.opencontainers.image.description='GraalPy is the GraalVM high-performance implementation of the Python programming language.'
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG GRAALVM_PKG=https://github.com/oracle/graalpy/releases/download/vm-$GRAALVM_VERSION/graalpy-$GRAALVM_VERSION-linux-amd64.tar.gz
 ARG TEMP_REGION=""
 
diff --git a/graalpy-community/Dockerfile.ol8-slim b/graalpy-community/Dockerfile.ol8-slim
index faf47dd..00d98c0 100644
--- a/graalpy-community/Dockerfile.ol8-slim
+++ b/graalpy-community/Dockerfile.ol8-slim
@@ -14,7 +14,7 @@ LABEL \
     org.opencontainers.image.authors='GraalVM Sustaining Team <graalvm-sustaining_ww_grp@oracle.com>' \
     org.opencontainers.image.description='GraalPy is the GraalVM high-performance implementation of the Python programming language.'
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG GRAALVM_PKG=https://github.com/oracle/graalpy/releases/download/vm-$GRAALVM_VERSION/graalpy-$GRAALVM_VERSION-linux-amd64.tar.gz
 ARG TEMP_REGION=""
 
diff --git a/graalpy-community/Dockerfile.ol9 b/graalpy-community/Dockerfile.ol9
index ff27957..9bdc8c4 100644
--- a/graalpy-community/Dockerfile.ol9
+++ b/graalpy-community/Dockerfile.ol9
@@ -14,7 +14,7 @@ LABEL \
     org.opencontainers.image.authors='GraalVM Sustaining Team <graalvm-sustaining_ww_grp@oracle.com>' \
     org.opencontainers.image.description='GraalPy is the GraalVM high-performance implementation of the Python programming language.'
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG GRAALVM_PKG=https://github.com/oracle/graalpy/releases/download/vm-$GRAALVM_VERSION/graalpy-$GRAALVM_VERSION-linux-amd64.tar.gz
 ARG TEMP_REGION=""
 
diff --git a/graalpy-community/Dockerfile.ol9-slim b/graalpy-community/Dockerfile.ol9-slim
index eab0a7a..edd68ce 100644
--- a/graalpy-community/Dockerfile.ol9-slim
+++ b/graalpy-community/Dockerfile.ol9-slim
@@ -13,7 +13,7 @@ LABEL \
     org.opencontainers.image.authors='GraalVM Sustaining Team <graalvm-sustaining_ww_grp@oracle.com>' \
     org.opencontainers.image.description='GraalPy is the GraalVM high-performance implementation of the Python programming language.'
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG GRAALVM_PKG=https://github.com/oracle/graalpy/releases/download/vm-$GRAALVM_VERSION/graalpy-$GRAALVM_VERSION-linux-amd64.tar.gz
 ARG TEMP_REGION=""
 
diff --git a/graalvm-community/Dockerfile.ol7-java17 b/graalvm-community/Dockerfile.ol7-java17
index 87beac3..09ad991 100644
--- a/graalvm-community/Dockerfile.ol7-java17
+++ b/graalvm-community/Dockerfile.ol7-java17
@@ -27,14 +27,15 @@ RUN yum update -y oraclelinux-release-el7 \
 
 RUN fc-cache -f -v
 
-ARG GRAALVM_VERSION=23.0.0
-ARG JDK_BUILD=17.0.7
+ARG GRAALVM_VERSION=23.1.0
+ARG JDK_VERSION=17.0.8
+ARG JDK_TAG="+7.1"
 ARG JAVA_VERSION=java17
-ARG GRAALVM_PKG=https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-$JDK_BUILD/graalvm-community-jdk-$JDK_BUILD_GRAALVM_ARCH_bin.tar.gz
+ARG GRAALVM_PKG=https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${JDK_VERSION}/graalvm-community-jdk-${JDK_VERSION}_GRAALVM_ARCH_bin.tar.gz
 ARG TARGETPLATFORM
 
 ENV LANG=en_US.UTF-8 \
-    JAVA_HOME=/opt/graalvm-community-$JAVA_VERSION
+    JAVA_HOME=/opt/graalvm-community-${JAVA_VERSION}
 
 COPY gu-wrapper.sh /usr/local/bin/gu
 RUN set -eux \
@@ -42,6 +43,7 @@ RUN set -eux \
     && if [ "$TARGETPLATFORM" == "linux/arm64" ]; then GRAALVM_PKG=${GRAALVM_PKG/GRAALVM_ARCH/linux-aarch64}; fi \
     && curl --fail --silent --location --retry 3 ${GRAALVM_PKG} \
     | gunzip | tar x -C /opt/ \
+    && mv graalvm-community-openjdk-${JDK_VERSION}${JDK_TAG} ${JAVA_HOME} \
     # Set alternative links
     && mkdir -p "/usr/java" \
     && ln -sfT "$JAVA_HOME" /usr/java/default \
diff --git a/graalvm-community/Dockerfile.ol7-java20 b/graalvm-community/Dockerfile.ol7-java20
index 0965fb3..e7cc271 100644
--- a/graalvm-community/Dockerfile.ol7-java20
+++ b/graalvm-community/Dockerfile.ol7-java20
@@ -27,13 +27,15 @@ RUN yum update -y oraclelinux-release-el7 \
 
 RUN fc-cache -f -v
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
+ARG JDK_VERSION=20.0.2
+ARG JDK_TAG="+9.1"
 ARG JAVA_VERSION=java20
-ARG GRAALVM_PKG=https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-$JDK_BUILD/graalvm-community-jdk-$JDK_BUILD_GRAALVM_ARCH_bin.tar.gz
+ARG GRAALVM_PKG=https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${JDK_VERSION}/graalvm-community-jdk-${JDK_VERSION}_GRAALVM_ARCH_bin.tar.gz
 ARG TARGETPLATFORM
 
 ENV LANG=en_US.UTF-8 \
-    JAVA_HOME=/opt/graalvm-community-$JAVA_VERSION
+    JAVA_HOME=/opt/graalvm-community-${JAVA_VERSION}
 
 COPY gu-wrapper.sh /usr/local/bin/gu
 RUN set -eux \
@@ -41,6 +43,7 @@ RUN set -eux \
     && if [ "$TARGETPLATFORM" == "linux/arm64" ]; then GRAALVM_PKG=${GRAALVM_PKG/GRAALVM_ARCH/linux-aarch64}; fi \
     && curl --fail --silent --location --retry 3 ${GRAALVM_PKG} \
     | gunzip | tar x -C /opt/ \
+    && mv graalvm-community-openjdk-${JDK_VERSION}${JDK_TAG} ${JAVA_HOME} \
     # Set alternative links
     && mkdir -p "/usr/java" \
     && ln -sfT "$JAVA_HOME" /usr/java/default \
diff --git a/graalvm-community/Dockerfile.ol8-java17 b/graalvm-community/Dockerfile.ol8-java17
index ecb5b9c..dac372b 100644
--- a/graalvm-community/Dockerfile.ol8-java17
+++ b/graalvm-community/Dockerfile.ol8-java17
@@ -21,13 +21,15 @@ RUN microdnf update -y oraclelinux-release-el8 \
 
 RUN fc-cache -f -v
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
+ARG JDK_VERSION=17.0.8
+ARG JDK_TAG="+7.1"
 ARG JAVA_VERSION=java17
-ARG GRAALVM_PKG=https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-$JDK_BUILD/graalvm-community-jdk-$JDK_BUILD_GRAALVM_ARCH_bin.tar.gz
+ARG GRAALVM_PKG=https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${JDK_VERSION}/graalvm-community-jdk-${JDK_VERSION}_GRAALVM_ARCH_bin.tar.gz
 ARG TARGETPLATFORM
 
 ENV LANG=en_US.UTF-8 \
-    JAVA_HOME=/opt/graalvm-community-$JAVA_VERSION
+    JAVA_HOME=/opt/graalvm-community-${JAVA_VERSION}
 
 COPY gu-wrapper.sh /usr/local/bin/gu
 RUN set -eux \
@@ -35,6 +37,7 @@ RUN set -eux \
     && if [ "$TARGETPLATFORM" == "linux/arm64" ]; then GRAALVM_PKG=${GRAALVM_PKG/GRAALVM_ARCH/linux-aarch64}; fi \
     && curl --fail --silent --location --retry 3 ${GRAALVM_PKG} \
     | gunzip | tar x -C /opt/ \
+    && mv graalvm-community-openjdk-${JDK_VERSION}${JDK_TAG} ${JAVA_HOME} \
     # Set alternative links
     && mkdir -p "/usr/java" \
     && ln -sfT "$JAVA_HOME" /usr/java/default \
diff --git a/graalvm-community/Dockerfile.ol8-java20 b/graalvm-community/Dockerfile.ol8-java20
index 318e58f..dfc700f 100644
--- a/graalvm-community/Dockerfile.ol8-java20
+++ b/graalvm-community/Dockerfile.ol8-java20
@@ -21,13 +21,15 @@ RUN microdnf update -y oraclelinux-release-el8 \
 
 RUN fc-cache -f -v
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
+ARG JDK_VERSION=20.0.2
+ARG JDK_TAG="+9.1"
 ARG JAVA_VERSION=java20
-ARG GRAALVM_PKG=https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-$JDK_BUILD/graalvm-community-jdk-$JDK_BUILD_GRAALVM_ARCH_bin.tar.gz
+ARG GRAALVM_PKG=https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${JDK_VERSION}/graalvm-community-jdk-${JDK_VERSION}_GRAALVM_ARCH_bin.tar.gz
 ARG TARGETPLATFORM
 
 ENV LANG=en_US.UTF-8 \
-    JAVA_HOME=/opt/graalvm-community-$JAVA_VERSION
+    JAVA_HOME=/opt/graalvm-community-${JAVA_VERSION}
 
 COPY gu-wrapper.sh /usr/local/bin/gu
 RUN set -eux \
@@ -35,6 +37,7 @@ RUN set -eux \
     && if [ "$TARGETPLATFORM" == "linux/arm64" ]; then GRAALVM_PKG=${GRAALVM_PKG/GRAALVM_ARCH/linux-aarch64}; fi \
     && curl --fail --silent --location --retry 3 ${GRAALVM_PKG} \
     | gunzip | tar x -C /opt/ \
+    && mv graalvm-community-openjdk-${JDK_VERSION}${JDK_TAG} ${JAVA_HOME} \
     # Set alternative links
     && mkdir -p "/usr/java" \
     && ln -sfT "$JAVA_HOME" /usr/java/default \
diff --git a/graalvm-community/Dockerfile.ol9-java17 b/graalvm-community/Dockerfile.ol9-java17
index 52bf83c..a70d40c 100644
--- a/graalvm-community/Dockerfile.ol9-java17
+++ b/graalvm-community/Dockerfile.ol9-java17
@@ -21,13 +21,15 @@ RUN microdnf update -y oraclelinux-release-el9 \
 
 RUN fc-cache -f -v
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
+ARG JDK_VERSION=17.0.8
+ARG JDK_TAG="+7.1"
 ARG JAVA_VERSION=java17
-ARG GRAALVM_PKG=https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-$JDK_BUILD/graalvm-community-jdk-$JDK_BUILD_GRAALVM_ARCH_bin.tar.gz
+ARG GRAALVM_PKG=https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${JDK_VERSION}/graalvm-community-jdk-${JDK_VERSION}_GRAALVM_ARCH_bin.tar.gz
 ARG TARGETPLATFORM
 
 ENV LANG=en_US.UTF-8 \
-    JAVA_HOME=/opt/graalvm-community-$JAVA_VERSION
+    JAVA_HOME=/opt/graalvm-community-${JAVA_VERSION}
 
 COPY gu-wrapper.sh /usr/local/bin/gu
 RUN set -eux \
@@ -35,6 +37,7 @@ RUN set -eux \
     && if [ "$TARGETPLATFORM" == "linux/arm64" ]; then GRAALVM_PKG=${GRAALVM_PKG/GRAALVM_ARCH/linux-aarch64}; fi \
     && curl --fail --silent --location --retry 3 ${GRAALVM_PKG} \
     | gunzip | tar x -C /opt/ \
+    && mv graalvm-community-openjdk-${JDK_VERSION}${JDK_TAG} ${JAVA_HOME} \
     # Set alternative links
     && mkdir -p "/usr/java" \
     && ln -sfT "$JAVA_HOME" /usr/java/default \
diff --git a/graalvm-community/Dockerfile.ol9-java20 b/graalvm-community/Dockerfile.ol9-java20
index 057ddc5..ecd6019 100644
--- a/graalvm-community/Dockerfile.ol9-java20
+++ b/graalvm-community/Dockerfile.ol9-java20
@@ -21,13 +21,15 @@ RUN microdnf update -y oraclelinux-release-el9 \
 
 RUN fc-cache -f -v
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
+ARG JDK_VERSION=20.0.2
+ARG JDK_TAG="+9.1"
 ARG JAVA_VERSION=java20
-ARG GRAALVM_PKG=https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-$JDK_BUILD/graalvm-community-jdk-$JDK_BUILD_GRAALVM_ARCH_bin.tar.gz
+ARG GRAALVM_PKG=https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${JDK_VERSION}/graalvm-community-jdk-${JDK_VERSION}_GRAALVM_ARCH_bin.tar.gz
 ARG TARGETPLATFORM
 
 ENV LANG=en_US.UTF-8 \
-    JAVA_HOME=/opt/graalvm-community-$JAVA_VERSION
+    JAVA_HOME=/opt/graalvm-community-${JAVA_VERSION}
 
 COPY gu-wrapper.sh /usr/local/bin/gu
 RUN set -eux \
@@ -35,6 +37,7 @@ RUN set -eux \
     && if [ "$TARGETPLATFORM" == "linux/arm64" ]; then GRAALVM_PKG=${GRAALVM_PKG/GRAALVM_ARCH/linux-aarch64}; fi \
     && curl --fail --silent --location --retry 3 ${GRAALVM_PKG} \
     | gunzip | tar x -C /opt/ \
+    && mv graalvm-community-openjdk-${JDK_VERSION}${JDK_TAG} ${JAVA_HOME} \
     # Set alternative links
     && mkdir -p "/usr/java" \
     && ln -sfT "$JAVA_HOME" /usr/java/default \
diff --git a/rpm-compact/jdk-community/Dockerfile.ol7-java17 b/rpm-compact/jdk-community/Dockerfile.ol7-java17
index 80eacb4..b8e8a25 100644
--- a/rpm-compact/jdk-community/Dockerfile.ol7-java17
+++ b/rpm-compact/jdk-community/Dockerfile.ol7-java17
@@ -17,7 +17,7 @@ LABEL \
 # Note: If you are behind a web proxy, set the build variables for the build:
 #       E.g.:  docker build --build-arg 'https_proxy=...' --build-arg 'http_proxy=...' --build-arg 'no_proxy=...' ...
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG JAVA_VERSION=17
 ARG YUM_REPO=""
 ARG YUM_REPO_DEFAULT=https://yum.oracle.com/repo/OracleLinux/OL7/graalvm/community/
diff --git a/rpm-compact/jdk-community/Dockerfile.ol7-java20 b/rpm-compact/jdk-community/Dockerfile.ol7-java20
index 18a85ce..0ed6211 100644
--- a/rpm-compact/jdk-community/Dockerfile.ol7-java20
+++ b/rpm-compact/jdk-community/Dockerfile.ol7-java20
@@ -18,7 +18,7 @@ LABEL \
 #       E.g.:  docker build --build-arg 'https_proxy=...' --build-arg 'http_proxy=...' --build-arg 'no_proxy=...' ...
 
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG JAVA_VERSION=20
 ARG YUM_REPO=""
 ARG YUM_REPO_DEFAULT=https://yum.oracle.com/repo/OracleLinux/OL7/graalvm/community/
@@ -40,7 +40,7 @@ enabled=1\
 " > /etc/yum.repos.d/ol7_graalvm_community.repo \
     && echo "$TEMP_REGION" > /etc/yum/vars/ociregion \
     && yum update -y \
-    && yum install -y graalvm-community-${JAVA_VERSION}-jdk-${JDK_BUILD} \
+    && yum install -y graalvm-community-${JAVA_VERSION}-jdk \
     && rm -rf /var/cache/yum \
     && echo "" > /etc/yum/vars/ociregion \
     && echo -e "\
diff --git a/rpm-compact/jdk-community/Dockerfile.ol8-java17 b/rpm-compact/jdk-community/Dockerfile.ol8-java17
index 3230f33..cf0869a 100644
--- a/rpm-compact/jdk-community/Dockerfile.ol8-java17
+++ b/rpm-compact/jdk-community/Dockerfile.ol8-java17
@@ -19,7 +19,7 @@ LABEL \
 #       E.g.:  docker build --build-arg 'https_proxy=...' --build-arg 'http_proxy=...' --build-arg 'no_proxy=...' ...
 
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG JAVA_VERSION=17
 ARG PLATFORM
 ARG YUM_REPO=""
diff --git a/rpm-compact/jdk-community/Dockerfile.ol8-java20 b/rpm-compact/jdk-community/Dockerfile.ol8-java20
index b71a507..d5afdd9 100644
--- a/rpm-compact/jdk-community/Dockerfile.ol8-java20
+++ b/rpm-compact/jdk-community/Dockerfile.ol8-java20
@@ -18,7 +18,7 @@ LABEL \
 #       E.g.:  docker build --build-arg 'https_proxy=...' --build-arg 'http_proxy=...' --build-arg 'no_proxy=...' ...
 
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG JAVA_VERSION=20
 ARG PLATFORM
 ARG YUM_REPO=""
diff --git a/rpm-compact/jdk-community/Dockerfile.ol9-java17 b/rpm-compact/jdk-community/Dockerfile.ol9-java17
index 48c5ee1..c1d3eef 100644
--- a/rpm-compact/jdk-community/Dockerfile.ol9-java17
+++ b/rpm-compact/jdk-community/Dockerfile.ol9-java17
@@ -18,7 +18,7 @@ LABEL \
 #       E.g.:  docker build --build-arg 'https_proxy=...' --build-arg 'http_proxy=...' --build-arg 'no_proxy=...' ...
 
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG JAVA_VERSION=17
 ARG PLATFORM
 ARG YUM_REPO=""
diff --git a/rpm-compact/jdk-community/Dockerfile.ol9-java20 b/rpm-compact/jdk-community/Dockerfile.ol9-java20
index 50a3674..3030bc2 100644
--- a/rpm-compact/jdk-community/Dockerfile.ol9-java20
+++ b/rpm-compact/jdk-community/Dockerfile.ol9-java20
@@ -18,7 +18,7 @@ LABEL \
 #       E.g.:  docker build --build-arg 'https_proxy=...' --build-arg 'http_proxy=...' --build-arg 'no_proxy=...' ...
 
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG JAVA_VERSION=20
 ARG PLATFORM
 ARG YUM_REPO=""
diff --git a/rpm-compact/native-image-community/Dockerfile.ol7-java17 b/rpm-compact/native-image-community/Dockerfile.ol7-java17
index 9c31a80..cb1b927 100644
--- a/rpm-compact/native-image-community/Dockerfile.ol7-java17
+++ b/rpm-compact/native-image-community/Dockerfile.ol7-java17
@@ -17,7 +17,7 @@ LABEL \
 # Note: If you are behind a web proxy, set the build variables for the build:
 #       E.g.:  docker build --build-arg 'https_proxy=...' --build-arg 'http_proxy=...' --build-arg 'no_proxy=...' ...
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG JAVA_VERSION=17
 ARG YUM_REPO=""
 ARG YUM_REPO_DEFAULT=https://yum.oracle.com/repo/OracleLinux/OL7/graalvm/community/
diff --git a/rpm-compact/native-image-community/Dockerfile.ol7-java17-muslib b/rpm-compact/native-image-community/Dockerfile.ol7-java17-muslib
index 2cde64c..b1cb730 100644
--- a/rpm-compact/native-image-community/Dockerfile.ol7-java17-muslib
+++ b/rpm-compact/native-image-community/Dockerfile.ol7-java17-muslib
@@ -3,7 +3,7 @@
 # Copyright (c) 2015,2022 Oracle and/or its affiliates. All rights reserved.
 #
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 
 ARG BASE_IMAGE=ghcr.io/graalvm/native-image-community:17-ol7
 
diff --git a/rpm-compact/native-image-community/Dockerfile.ol7-java20 b/rpm-compact/native-image-community/Dockerfile.ol7-java20
index 3b2f54a..321ddb4 100644
--- a/rpm-compact/native-image-community/Dockerfile.ol7-java20
+++ b/rpm-compact/native-image-community/Dockerfile.ol7-java20
@@ -17,7 +17,7 @@ LABEL \
 # Note: If you are behind a web proxy, set the build variables for the build:
 #       E.g.:  docker build --build-arg 'https_proxy=...' --build-arg 'http_proxy=...' --build-arg 'no_proxy=...' ...
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG JAVA_VERSION=20
 ARG YUM_REPO=""
 ARG YUM_REPO_DEFAULT=https://yum.oracle.com/repo/OracleLinux/OL7/graalvm/community/
diff --git a/rpm-compact/native-image-community/Dockerfile.ol7-java20-muslib b/rpm-compact/native-image-community/Dockerfile.ol7-java20-muslib
index 40b493a..416831a 100644
--- a/rpm-compact/native-image-community/Dockerfile.ol7-java20-muslib
+++ b/rpm-compact/native-image-community/Dockerfile.ol7-java20-muslib
@@ -3,7 +3,7 @@
 # Copyright (c) 2015,2022 Oracle and/or its affiliates. All rights reserved.
 #
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 
 ARG BASE_IMAGE=ghcr.io/graalvm/native-image-community:20-ol7
 
diff --git a/rpm-compact/native-image-community/Dockerfile.ol8-java17 b/rpm-compact/native-image-community/Dockerfile.ol8-java17
index ef61b56..a4c7029 100644
--- a/rpm-compact/native-image-community/Dockerfile.ol8-java17
+++ b/rpm-compact/native-image-community/Dockerfile.ol8-java17
@@ -17,7 +17,7 @@ LABEL \
 # Note: If you are behind a web proxy, set the build variables for the build:
 #       E.g.:  docker build --build-arg 'https_proxy=...' --build-arg 'http_proxy=...' --build-arg 'no_proxy=...' ...
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG JAVA_VERSION=17
 ARG YUM_REPO=""
 ARG YUM_REPO_DEFAULT=https://yum.oracle.com/repo/OracleLinux/OL8/graalvm/community/
diff --git a/rpm-compact/native-image-community/Dockerfile.ol8-java17-muslib b/rpm-compact/native-image-community/Dockerfile.ol8-java17-muslib
index 5253f0b..ff14958 100644
--- a/rpm-compact/native-image-community/Dockerfile.ol8-java17-muslib
+++ b/rpm-compact/native-image-community/Dockerfile.ol8-java17-muslib
@@ -3,7 +3,7 @@
 # Copyright (c) 2015,2022 Oracle and/or its affiliates. All rights reserved.
 #
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 
 ARG BASE_IMAGE=ghcr.io/graalvm/native-image-community:17-ol8
 
diff --git a/rpm-compact/native-image-community/Dockerfile.ol8-java20 b/rpm-compact/native-image-community/Dockerfile.ol8-java20
index 68996df..4195673 100644
--- a/rpm-compact/native-image-community/Dockerfile.ol8-java20
+++ b/rpm-compact/native-image-community/Dockerfile.ol8-java20
@@ -17,7 +17,7 @@ LABEL \
 # Note: If you are behind a web proxy, set the build variables for the build:
 #       E.g.:  docker build --build-arg 'https_proxy=...' --build-arg 'http_proxy=...' --build-arg 'no_proxy=...' ...
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG JAVA_VERSION=20
 ARG YUM_REPO=""
 ARG YUM_REPO_DEFAULT=https://yum.oracle.com/repo/OracleLinux/OL8/graalvm/community/
diff --git a/rpm-compact/native-image-community/Dockerfile.ol8-java20-muslib b/rpm-compact/native-image-community/Dockerfile.ol8-java20-muslib
index 6b0c726..5cd287b 100644
--- a/rpm-compact/native-image-community/Dockerfile.ol8-java20-muslib
+++ b/rpm-compact/native-image-community/Dockerfile.ol8-java20-muslib
@@ -3,7 +3,7 @@
 # Copyright (c) 2015,2022 Oracle and/or its affiliates. All rights reserved.
 #
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 
 ARG BASE_IMAGE=ghcr.io/graalvm/native-image-community:20-ol8
 
diff --git a/rpm-compact/native-image-community/Dockerfile.ol9-java17 b/rpm-compact/native-image-community/Dockerfile.ol9-java17
index 0384099..b3493e8 100644
--- a/rpm-compact/native-image-community/Dockerfile.ol9-java17
+++ b/rpm-compact/native-image-community/Dockerfile.ol9-java17
@@ -17,7 +17,7 @@ LABEL \
 # Note: If you are behind a web proxy, set the build variables for the build:
 #       E.g.:  docker build --build-arg 'https_proxy=...' --build-arg 'http_proxy=...' --build-arg 'no_proxy=...' ...
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG JAVA_VERSION=17
 ARG YUM_REPO=""
 ARG YUM_REPO_DEFAULT=https://yum.oracle.com/repo/OracleLinux/OL9/graalvm/community/
diff --git a/rpm-compact/native-image-community/Dockerfile.ol9-java17-muslib b/rpm-compact/native-image-community/Dockerfile.ol9-java17-muslib
index 6afdcc9..b5bdeb1 100644
--- a/rpm-compact/native-image-community/Dockerfile.ol9-java17-muslib
+++ b/rpm-compact/native-image-community/Dockerfile.ol9-java17-muslib
@@ -3,7 +3,7 @@
 # Copyright (c) 2015,2022 Oracle and/or its affiliates. All rights reserved.
 #
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 
 ARG BASE_IMAGE=ghcr.io/graalvm/native-image-community:17-ol9
 
diff --git a/rpm-compact/native-image-community/Dockerfile.ol9-java20 b/rpm-compact/native-image-community/Dockerfile.ol9-java20
index f3e897b..ca1ac08 100644
--- a/rpm-compact/native-image-community/Dockerfile.ol9-java20
+++ b/rpm-compact/native-image-community/Dockerfile.ol9-java20
@@ -17,7 +17,7 @@ LABEL \
 # Note: If you are behind a web proxy, set the build variables for the build:
 #       E.g.:  docker build --build-arg 'https_proxy=...' --build-arg 'http_proxy=...' --build-arg 'no_proxy=...' ...
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG JAVA_VERSION=20
 ARG YUM_REPO=""
 ARG YUM_REPO_DEFAULT=https://yum.oracle.com/repo/OracleLinux/OL9/graalvm/community/
diff --git a/rpm-compact/native-image-community/Dockerfile.ol9-java20-muslib b/rpm-compact/native-image-community/Dockerfile.ol9-java20-muslib
index 73dde4f..232a0a4 100644
--- a/rpm-compact/native-image-community/Dockerfile.ol9-java20-muslib
+++ b/rpm-compact/native-image-community/Dockerfile.ol9-java20-muslib
@@ -3,7 +3,7 @@
 # Copyright (c) 2015,2022 Oracle and/or its affiliates. All rights reserved.
 #
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 
 ARG BASE_IMAGE=ghcr.io/graalvm/native-image-community:20-ol9
 
diff --git a/rpm-compact/nodejs-community/Dockerfile.ol7-java17 b/rpm-compact/nodejs-community/Dockerfile.ol7-java17
index a8ff812..4a15425 100644
--- a/rpm-compact/nodejs-community/Dockerfile.ol7-java17
+++ b/rpm-compact/nodejs-community/Dockerfile.ol7-java17
@@ -17,7 +17,7 @@ LABEL \
 # Note: If you are behind a web proxy, set the build variables for the build:
 #       E.g.:  docker build --build-arg 'https_proxy=...' --build-arg 'http_proxy=...' --build-arg 'no_proxy=...' ...
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG JAVA_VERSION=17
 ARG YUM_REPO=""
 ARG YUM_REPO_DEFAULT=https://yum.oracle.com/repo/OracleLinux/OL7/graalvm/community/
@@ -39,11 +39,11 @@ enabled=1\
 " > /etc/yum.repos.d/ol7_graalvm_community.repo \
     && echo "$TEMP_REGION" > /etc/yum/vars/ociregion \
     && yum update -y \
-    && yum install -y graalvm${GRAALVM_YEAR_VERSION}-ce-${JAVA_VERSION}-nodejs-devel-${GRAALVM_VERSION} \
+    && yum install -y graalvm-community-${JAVA_VERSION}-nodejs-devel \
     && rm -rf /var/cache/yum \
-    && ln -s /usr/lib64/graalvm/graalvm${GRAALVM_YEAR_VERSION}-ce-java${JAVA_VERSION}/bin/node /usr/local/bin/node \
-    && ln -s /usr/lib64/graalvm/graalvm${GRAALVM_YEAR_VERSION}-ce-java${JAVA_VERSION}/bin/npm /usr/local/bin/npm \
-    && ln -s /usr/lib64/graalvm/graalvm${GRAALVM_YEAR_VERSION}-ce-java${JAVA_VERSION}/bin/npx /usr/local/bin/npx \
+    && ln -s ${JAVA_HOME}/bin/node /usr/local/bin/node \
+    && ln -s ${JAVA_HOME}/bin/npm /usr/local/bin/npm \
+    && ln -s ${JAVA_HOME}/bin/npx /usr/local/bin/npx \
     && echo "" > /etc/yum/vars/ociregion \
     && echo -e "\
 [ol7_graalvm_community]\n\
diff --git a/rpm-compact/nodejs-community/Dockerfile.ol7-java20 b/rpm-compact/nodejs-community/Dockerfile.ol7-java20
index 45b9416..026a78d 100644
--- a/rpm-compact/nodejs-community/Dockerfile.ol7-java20
+++ b/rpm-compact/nodejs-community/Dockerfile.ol7-java20
@@ -17,7 +17,7 @@ LABEL \
 # Note: If you are behind a web proxy, set the build variables for the build:
 #       E.g.:  docker build --build-arg 'https_proxy=...' --build-arg 'http_proxy=...' --build-arg 'no_proxy=...' ...
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG JAVA_VERSION=20
 ARG YUM_REPO=""
 ARG YUM_REPO_DEFAULT=https://yum.oracle.com/repo/OracleLinux/OL7/graalvm/community/
@@ -39,11 +39,11 @@ enabled=1\
 " > /etc/yum.repos.d/ol7_graalvm_community.repo \
     && echo "$TEMP_REGION" > /etc/yum/vars/ociregion \
     && yum update -y \
-    && yum install -y graalvm${GRAALVM_YEAR_VERSION}-ce-${JAVA_VERSION}-nodejs-devel-${GRAALVM_VERSION} \
+    && yum install -y graalvm-community-${JAVA_VERSION}-nodejs-devel \
     && rm -rf /var/cache/yum \
-    && ln -s /usr/lib64/graalvm/graalvm${GRAALVM_YEAR_VERSION}-ce-java${JAVA_VERSION}/bin/node /usr/local/bin/node \
-    && ln -s /usr/lib64/graalvm/graalvm${GRAALVM_YEAR_VERSION}-ce-java${JAVA_VERSION}/bin/npm /usr/local/bin/npm \
-    && ln -s /usr/lib64/graalvm/graalvm${GRAALVM_YEAR_VERSION}-ce-java${JAVA_VERSION}/bin/npx /usr/local/bin/npx \
+    && ln -s ${JAVA_HOME}/bin/node /usr/local/bin/node \
+    && ln -s ${JAVA_HOME}/bin/npm /usr/local/bin/npm \
+    && ln -s ${JAVA_HOME}/bin/npx /usr/local/bin/npx \
     && echo "" > /etc/yum/vars/ociregion \
     && echo -e "\
 [ol7_graalvm_community]\n\
diff --git a/rpm-compact/nodejs-community/Dockerfile.ol8-java17 b/rpm-compact/nodejs-community/Dockerfile.ol8-java17
index e14ffd3..16c2732 100644
--- a/rpm-compact/nodejs-community/Dockerfile.ol8-java17
+++ b/rpm-compact/nodejs-community/Dockerfile.ol8-java17
@@ -17,7 +17,7 @@ LABEL \
 # Note: If you are behind a web proxy, set the build variables for the build:
 #       E.g.:  docker build --build-arg 'https_proxy=...' --build-arg 'http_proxy=...' --build-arg 'no_proxy=...' ...
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG JAVA_VERSION=17
 ARG YUM_REPO=""
 ARG YUM_REPO_DEFAULT=https://yum.oracle.com/repo/OracleLinux/OL8/graalvm/community/
@@ -38,11 +38,11 @@ gpgcheck=1\n\
 enabled=1\
 " > /etc/yum.repos.d/ol8_graalvm_community.repo \
     && echo "$TEMP_REGION" > /etc/dnf/vars/ociregion \
-    && microdnf --enablerepo ol8_codeready_builder install -y graalvm${GRAALVM_YEAR_VERSION}-ce-${JAVA_VERSION}-nodejs-devel-${GRAALVM_VERSION} \
+    && microdnf --enablerepo ol8_codeready_builder install -y graalvm-community-${JAVA_VERSION}-nodejs-devel \
     && rm -rf /var/cache/yum \
-    && ln -s /usr/lib64/graalvm/graalvm${GRAALVM_YEAR_VERSION}-ce-java${JAVA_VERSION}/bin/node /usr/local/bin/node \
-    && ln -s /usr/lib64/graalvm/graalvm${GRAALVM_YEAR_VERSION}-ce-java${JAVA_VERSION}/bin/npm /usr/local/bin/npm \
-    && ln -s /usr/lib64/graalvm/graalvm${GRAALVM_YEAR_VERSION}-ce-java${JAVA_VERSION}/bin/npx /usr/local/bin/npx \
+    && ln -s ${JAVA_HOME}/bin/node /usr/local/bin/node \
+    && ln -s ${JAVA_HOME}/bin/npm /usr/local/bin/npm \
+    && ln -s ${JAVA_HOME}/bin/npx /usr/local/bin/npx \
     && echo "" > /etc/dnf/vars/ociregion \
     && echo -e "\
 [ol8_graalvm_community]\n\
diff --git a/rpm-compact/nodejs-community/Dockerfile.ol8-java20 b/rpm-compact/nodejs-community/Dockerfile.ol8-java20
index 6c99ff9..2c306b5 100644
--- a/rpm-compact/nodejs-community/Dockerfile.ol8-java20
+++ b/rpm-compact/nodejs-community/Dockerfile.ol8-java20
@@ -17,7 +17,7 @@ LABEL \
 # Note: If you are behind a web proxy, set the build variables for the build:
 #       E.g.:  docker build --build-arg 'https_proxy=...' --build-arg 'http_proxy=...' --build-arg 'no_proxy=...' ...
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG JAVA_VERSION=20
 ARG YUM_REPO=""
 ARG YUM_REPO_DEFAULT=https://yum.oracle.com/repo/OracleLinux/OL8/graalvm/community/
@@ -38,11 +38,11 @@ gpgcheck=1\n\
 enabled=1\
 " > /etc/yum.repos.d/ol8_graalvm_community.repo \
     && echo "$TEMP_REGION" > /etc/dnf/vars/ociregion \
-    && microdnf --enablerepo ol8_codeready_builder install -y graalvm${GRAALVM_YEAR_VERSION}-ce-${JAVA_VERSION}-nodejs-devel-${GRAALVM_VERSION} \
+    && microdnf --enablerepo ol8_codeready_builder install -y graalvm-community-${JAVA_VERSION}-nodejs-devel \
     && rm -rf /var/cache/yum \
-    && ln -s /usr/lib64/graalvm/graalvm${GRAALVM_YEAR_VERSION}-ce-java${JAVA_VERSION}/bin/node /usr/local/bin/node \
-    && ln -s /usr/lib64/graalvm/graalvm${GRAALVM_YEAR_VERSION}-ce-java${JAVA_VERSION}/bin/npm /usr/local/bin/npm \
-    && ln -s /usr/lib64/graalvm/graalvm${GRAALVM_YEAR_VERSION}-ce-java${JAVA_VERSION}/bin/npx /usr/local/bin/npx \
+    && ln -s ${JAVA_HOME}/bin/node /usr/local/bin/node \
+    && ln -s ${JAVA_HOME}/bin/npm /usr/local/bin/npm \
+    && ln -s ${JAVA_HOME}/bin/npx /usr/local/bin/npx \
     && echo "" > /etc/dnf/vars/ociregion \
     && echo -e "\
 [ol8_graalvm_community]\n\
diff --git a/rpm-compact/nodejs-community/Dockerfile.ol9-java17 b/rpm-compact/nodejs-community/Dockerfile.ol9-java17
index ecc68ba..6022437 100644
--- a/rpm-compact/nodejs-community/Dockerfile.ol9-java17
+++ b/rpm-compact/nodejs-community/Dockerfile.ol9-java17
@@ -17,7 +17,7 @@ LABEL \
 # Note: If you are behind a web proxy, set the build variables for the build:
 #       E.g.:  docker build --build-arg 'https_proxy=...' --build-arg 'http_proxy=...' --build-arg 'no_proxy=...' ...
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG JAVA_VERSION=17
 ARG YUM_REPO=""
 ARG YUM_REPO_DEFAULT=https://yum.oracle.com/repo/OracleLinux/OL9/graalvm/community/
@@ -38,11 +38,11 @@ gpgcheck=1\n\
 enabled=1\
 " > /etc/yum.repos.d/ol9_graalvm_community.repo \
     && echo "$TEMP_REGION" > /etc/dnf/vars/ociregion \
-    && microdnf --enablerepo ol9_codeready_builder install -y graalvm${GRAALVM_YEAR_VERSION}-ce-${JAVA_VERSION}-nodejs-devel-${GRAALVM_VERSION} \
+    && microdnf --enablerepo ol9_codeready_builder install -y graalvm-community-${JAVA_VERSION}-nodejs-devel \
     && rm -rf /var/cache/yum \
-    && ln -s /usr/lib64/graalvm/graalvm${GRAALVM_YEAR_VERSION}-ce-java${JAVA_VERSION}/bin/node /usr/local/bin/node \
-    && ln -s /usr/lib64/graalvm/graalvm${GRAALVM_YEAR_VERSION}-ce-java${JAVA_VERSION}/bin/npm /usr/local/bin/npm \
-    && ln -s /usr/lib64/graalvm/graalvm${GRAALVM_YEAR_VERSION}-ce-java${JAVA_VERSION}/bin/npx /usr/local/bin/npx \
+    && ln -s ${JAVA_HOME}/bin/node /usr/local/bin/node \
+    && ln -s ${JAVA_HOME}/bin/npm /usr/local/bin/npm \
+    && ln -s ${JAVA_HOME}/bin/npx /usr/local/bin/npx \
     && echo "" > /etc/dnf/vars/ociregion \
     && echo -e "\
 [ol9_graalvm_community]\n\
diff --git a/rpm-compact/nodejs-community/Dockerfile.ol9-java20 b/rpm-compact/nodejs-community/Dockerfile.ol9-java20
index d4be69e..720c65c 100644
--- a/rpm-compact/nodejs-community/Dockerfile.ol9-java20
+++ b/rpm-compact/nodejs-community/Dockerfile.ol9-java20
@@ -17,7 +17,7 @@ LABEL \
 # Note: If you are behind a web proxy, set the build variables for the build:
 #       E.g.:  docker build --build-arg 'https_proxy=...' --build-arg 'http_proxy=...' --build-arg 'no_proxy=...' ...
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG JAVA_VERSION=20
 ARG YUM_REPO=""
 ARG YUM_REPO_DEFAULT=https://yum.oracle.com/repo/OracleLinux/OL9/graalvm/community/
@@ -38,11 +38,11 @@ gpgcheck=1\n\
 enabled=1\
 " > /etc/yum.repos.d/ol9_graalvm_community.repo \
     && echo "$TEMP_REGION" > /etc/dnf/vars/ociregion \
-    && microdnf --enablerepo ol9_codeready_builder install -y graalvm${GRAALVM_YEAR_VERSION}-ce-${JAVA_VERSION}-nodejs-devel-${GRAALVM_VERSION} \
+    && microdnf --enablerepo ol9_codeready_builder install -y graalvm-community-${JAVA_VERSION}-nodejs-devel \
     && rm -rf /var/cache/yum \
-    && ln -s /usr/lib64/graalvm/graalvm${GRAALVM_YEAR_VERSION}-ce-java${JAVA_VERSION}/bin/node /usr/local/bin/node \
-    && ln -s /usr/lib64/graalvm/graalvm${GRAALVM_YEAR_VERSION}-ce-java${JAVA_VERSION}/bin/npm /usr/local/bin/npm \
-    && ln -s /usr/lib64/graalvm/graalvm${GRAALVM_YEAR_VERSION}-ce-java${JAVA_VERSION}/bin/npx /usr/local/bin/npx \
+    && ln -s ${JAVA_HOME}/bin/node /usr/local/bin/node \
+    && ln -s ${JAVA_HOME}/bin/npm /usr/local/bin/npm \
+    && ln -s ${JAVA_HOME}/bin/npx /usr/local/bin/npx \
     && echo "" > /etc/dnf/vars/ociregion \
     && echo -e "\
 [ol9_graalvm_community]\n\
diff --git a/truffleruby-community/Dockerfile.debian b/truffleruby-community/Dockerfile.debian
index 5c4dda0..378254e 100644
--- a/truffleruby-community/Dockerfile.debian
+++ b/truffleruby-community/Dockerfile.debian
@@ -14,7 +14,7 @@ LABEL \
     org.opencontainers.image.authors='GraalVM Sustaining Team <graalvm-sustaining_ww_grp@oracle.com>' \
     org.opencontainers.image.description='TruffleRuby is the GraalVM high-performance implementation of the Ruby programming language.'
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG TARGETPLATFORM
 ARG GRAALVM_PKG=https://github.com/oracle/truffleruby/releases/download/vm-$GRAALVM_VERSION/truffleruby-$GRAALVM_VERSION-GRAALVM_ARCH.tar.gz
 
diff --git a/truffleruby-community/Dockerfile.ol7 b/truffleruby-community/Dockerfile.ol7
index 11e989a..1bc642b 100644
--- a/truffleruby-community/Dockerfile.ol7
+++ b/truffleruby-community/Dockerfile.ol7
@@ -14,7 +14,7 @@ LABEL \
     org.opencontainers.image.authors='GraalVM Sustaining Team <graalvm-sustaining_ww_grp@oracle.com>' \
     org.opencontainers.image.description='TruffleRuby is the GraalVM high-performance implementation of the Ruby programming language.'
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG TARGETPLATFORM
 ARG GRAALVM_PKG=https://github.com/oracle/truffleruby/releases/download/vm-$GRAALVM_VERSION/truffleruby-$GRAALVM_VERSION-GRAALVM_ARCH.tar.gz
 ARG TEMP_REGION=""
diff --git a/truffleruby-community/Dockerfile.ol7-java17-slim-jvm b/truffleruby-community/Dockerfile.ol7-java17-slim-jvm
index 79a1d4f..b9e6ccc 100644
--- a/truffleruby-community/Dockerfile.ol7-java17-slim-jvm
+++ b/truffleruby-community/Dockerfile.ol7-java17-slim-jvm
@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
 #
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.0.1
 
 ARG BASE_IMAGE=ghcr.io/graalvm/jdk:ol7-java17-$GRAALVM_VERSION
 
diff --git a/truffleruby-community/Dockerfile.ol7-java20-slim-jvm b/truffleruby-community/Dockerfile.ol7-java20-slim-jvm
index e2c47b2..f3c1bfc 100644
--- a/truffleruby-community/Dockerfile.ol7-java20-slim-jvm
+++ b/truffleruby-community/Dockerfile.ol7-java20-slim-jvm
@@ -3,7 +3,7 @@
 # Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
 #
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.0.1
 
 ARG BASE_IMAGE=ghcr.io/graalvm/jdk:ol7-java11-$GRAALVM_VERSION
 
diff --git a/truffleruby-community/Dockerfile.ol7-slim b/truffleruby-community/Dockerfile.ol7-slim
index 80d5019..5e98f9c 100644
--- a/truffleruby-community/Dockerfile.ol7-slim
+++ b/truffleruby-community/Dockerfile.ol7-slim
@@ -14,7 +14,7 @@ LABEL \
     org.opencontainers.image.authors='GraalVM Sustaining Team <graalvm-sustaining_ww_grp@oracle.com>' \
     org.opencontainers.image.description='TruffleRuby is the GraalVM high-performance implementation of the Ruby programming language.'
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG TARGETPLATFORM
 ARG GRAALVM_PKG=https://github.com/oracle/truffleruby/releases/download/vm-$GRAALVM_VERSION/truffleruby-$GRAALVM_VERSION-GRAALVM_ARCH.tar.gz
 ARG TEMP_REGION=""
diff --git a/truffleruby-community/Dockerfile.ol8 b/truffleruby-community/Dockerfile.ol8
index 3b72148..fdc3ba9 100644
--- a/truffleruby-community/Dockerfile.ol8
+++ b/truffleruby-community/Dockerfile.ol8
@@ -14,7 +14,7 @@ LABEL \
     org.opencontainers.image.authors='GraalVM Sustaining Team <graalvm-sustaining_ww_grp@oracle.com>' \
     org.opencontainers.image.description='TruffleRuby is the GraalVM high-performance implementation of the Ruby programming language.'
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG TARGETPLATFORM
 ARG GRAALVM_PKG=https://github.com/oracle/truffleruby/releases/download/vm-$GRAALVM_VERSION/truffleruby-$GRAALVM_VERSION-GRAALVM_ARCH.tar.gz
 ARG TEMP_REGION=""
diff --git a/truffleruby-community/Dockerfile.ol8-java17-slim-jvm b/truffleruby-community/Dockerfile.ol8-java17-slim-jvm
index b2771c5..d25addb 100644
--- a/truffleruby-community/Dockerfile.ol8-java17-slim-jvm
+++ b/truffleruby-community/Dockerfile.ol8-java17-slim-jvm
@@ -3,7 +3,7 @@
 # Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
 #
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.0.1
 
 ARG BASE_IMAGE=ghcr.io/graalvm/jdk:ol8-java17-$GRAALVM_VERSION
 
diff --git a/truffleruby-community/Dockerfile.ol8-java20-slim-jvm b/truffleruby-community/Dockerfile.ol8-java20-slim-jvm
index 70a0af3..877812b 100644
--- a/truffleruby-community/Dockerfile.ol8-java20-slim-jvm
+++ b/truffleruby-community/Dockerfile.ol8-java20-slim-jvm
@@ -3,7 +3,7 @@
 # Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
 #
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.0.1
 
 ARG BASE_IMAGE=ghcr.io/graalvm/jdk:ol8-java11-$GRAALVM_VERSION
 
diff --git a/truffleruby-community/Dockerfile.ol8-slim b/truffleruby-community/Dockerfile.ol8-slim
index 57a8858..618bec1 100644
--- a/truffleruby-community/Dockerfile.ol8-slim
+++ b/truffleruby-community/Dockerfile.ol8-slim
@@ -14,7 +14,7 @@ LABEL \
     org.opencontainers.image.authors='GraalVM Sustaining Team <graalvm-sustaining_ww_grp@oracle.com>' \
     org.opencontainers.image.description='TruffleRuby is the GraalVM high-performance implementation of the Ruby programming language.'
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG TARGETPLATFORM
 ARG GRAALVM_PKG=https://github.com/oracle/truffleruby/releases/download/vm-$GRAALVM_VERSION/truffleruby-$GRAALVM_VERSION-GRAALVM_ARCH.tar.gz
 ARG TEMP_REGION=""
diff --git a/truffleruby-community/Dockerfile.ol9 b/truffleruby-community/Dockerfile.ol9
index bc373f5..95611be 100644
--- a/truffleruby-community/Dockerfile.ol9
+++ b/truffleruby-community/Dockerfile.ol9
@@ -14,7 +14,7 @@ LABEL \
     org.opencontainers.image.authors='GraalVM Sustaining Team <graalvm-sustaining_ww_grp@oracle.com>' \
     org.opencontainers.image.description='TruffleRuby is the GraalVM high-performance implementation of the Ruby programming language.'
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG TARGETPLATFORM
 ARG GRAALVM_PKG=https://github.com/oracle/truffleruby/releases/download/vm-$GRAALVM_VERSION/truffleruby-$GRAALVM_VERSION-GRAALVM_ARCH.tar.gz
 ARG TEMP_REGION=""
diff --git a/truffleruby-community/Dockerfile.ol9-java17-slim-jvm b/truffleruby-community/Dockerfile.ol9-java17-slim-jvm
index 440201e..02cc2b4 100644
--- a/truffleruby-community/Dockerfile.ol9-java17-slim-jvm
+++ b/truffleruby-community/Dockerfile.ol9-java17-slim-jvm
@@ -3,7 +3,7 @@
 # Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
 #
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.0.1
 
 ARG BASE_IMAGE=ghcr.io/graalvm/jdk:ol9-java17-$GRAALVM_VERSION
 
diff --git a/truffleruby-community/Dockerfile.ol9-java20-slim-jvm b/truffleruby-community/Dockerfile.ol9-java20-slim-jvm
index fb957e1..e2a5b71 100644
--- a/truffleruby-community/Dockerfile.ol9-java20-slim-jvm
+++ b/truffleruby-community/Dockerfile.ol9-java20-slim-jvm
@@ -3,7 +3,7 @@
 # Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
 #
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.0.1
 
 ARG BASE_IMAGE=ghcr.io/graalvm/jdk:ol9-java11-$GRAALVM_VERSION
 
diff --git a/truffleruby-community/Dockerfile.ol9-slim b/truffleruby-community/Dockerfile.ol9-slim
index 5460c20..02ff273 100644
--- a/truffleruby-community/Dockerfile.ol9-slim
+++ b/truffleruby-community/Dockerfile.ol9-slim
@@ -14,7 +14,7 @@ LABEL \
     org.opencontainers.image.authors='GraalVM Sustaining Team <graalvm-sustaining_ww_grp@oracle.com>' \
     org.opencontainers.image.description='TruffleRuby is the GraalVM high-performance implementation of the Ruby programming language.'
 
-ARG GRAALVM_VERSION=23.0.0
+ARG GRAALVM_VERSION=23.1.0
 ARG TARGETPLATFORM
 ARG GRAALVM_PKG=https://github.com/oracle/truffleruby/releases/download/vm-$GRAALVM_VERSION/truffleruby-$GRAALVM_VERSION-GRAALVM_ARCH.tar.gz
 ARG TEMP_REGION=""