diff --git a/.gitignore b/.gitignore
index c8d6bc30..a49b1ebc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,9 @@ dependency-reduced-pom.xml
 *.ipr
 *.iws
 
+# VS Code
+.vscode/
+
 # MacOS
 *.DS_Store
 
diff --git a/docker-images/base-image/Dockerfile b/docker-images/base-image/Dockerfile
index be3ef8a1..48adc8ea 100644
--- a/docker-images/base-image/Dockerfile
+++ b/docker-images/base-image/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM alpine:3.20.3
+FROM alpine:3.20.7
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -20,19 +20,19 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 RUN apk upgrade --no-cache && apk add --no-cache fontconfig libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib libc6-compat gcompat libgcc\
     && rm -rf /var/cache/apk/*
 
-ENV JAVA_VERSION jdk-21.0.5_11
+ENV JAVA_VERSION jdk-21.0.8_9
 
 
 RUN set -eux; \
     ARCH="$(apk --print-arch)"; \
     case "${ARCH}" in \
       amd64|x86_64) \
-          ESUM='2dfa33fb8e9474e6967c6cf17964abb5ddce9c17fa6a9f8d7aa221a0ae295df9'; \
-          BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.5_11.tar.gz'; \
+          ESUM='f499e2d5c596fd531c8427b2fb207c9eeabed783adad32aeed64b03dd476a231'; \
+          BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.8_9.tar.gz'; \
          ;; \
       aarch64) \
-          ESUM='12b988a3d934e3eb89c6a981a93f8e2adf0a62cc9030487dee76c0c29b93714d'; \
-          BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.5_11.tar.gz'; \
+          ESUM='f495749fce8d8974323f30428c1183168f90592dc90bb94c96edab33ffccc94e'; \
+          BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.8_9.tar.gz'; \
         ;;\
       *) \
          echo "Unsupported arch: ${ARCH}"; \