diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c71924cb490b4574589297ccc8709492cea8223..2ef10b1df5c84e5c0b03bb20bc5604fa8a4349a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ variables:
     - docker:20.10.16-dind
   script:
     - "docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY"
-    - "docker pull $CI_REGISTRY_IMAGE:$IMAGE_TAG"
+    - "docker pull $CI_REGISTRY_IMAGE:$IMAGE_TAG || true"
     - "docker build --cache-from $CI_REGISTRY_IMAGE:$IMAGE_TAG -t $CI_REGISTRY_IMAGE:$IMAGE_TAG -f $DOCKERFILE ."
     - "docker push $CI_REGISTRY_IMAGE:$IMAGE_TAG"
     - 'if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker tag $CI_REGISTRY_IMAGE:$IMAGE_TAG $CI_REGISTRY_IMAGE:$IMAGE_TAG_RELEASE && docker push $CI_REGISTRY_IMAGE:$IMAGE_TAG_RELEASE ; fi'
diff --git a/Dockerfile b/Dockerfile
index dfcbec2bdba6070851d471fcc1b19bf7833658b9..80535e7987adc593e2dfd52b8d49acf123e95224 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -180,10 +180,10 @@ RUN chmod a+x /usr/local/bin/repo
 RUN ln -fs /usr/bin/python3 /usr/bin/python
 
 # Use adoptopenjdk.net to be able to use OpeJDK8 on debian:buster
-RUN curl -q https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add -
-RUN add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
-RUN apt-get -qq update && apt-get install -y adoptopenjdk-8-hotspot=8u282-b08-3
-RUN update-alternatives --set java /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/bin/java
+RUN curl -q https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add -
+RUN add-apt-repository --yes https://packages.adoptium.net/artifactory/deb
+RUN apt-get -qq update && apt-get install -y temurin-8-jdk
+RUN update-alternatives --set java /usr/lib/jvm/temurin-8-jdk-amd64/bin/java
 
 
 # Fix jack server SSL issue during build for openjdk (adoptopenjdk won't work for nougat and oreo)
diff --git a/Dockerfile.community b/Dockerfile.community
index a45cd774aa9dcdab7c94ec03a65a77f4c44aa911..b343e2a1cf4ff8e5ce5faaf9a44405b0e6e098f4 100644
--- a/Dockerfile.community
+++ b/Dockerfile.community
@@ -166,10 +166,10 @@ RUN chmod a+x /usr/local/bin/repo
 RUN ln -fs /usr/bin/python3 /usr/bin/python
 
 # Use adoptopenjdk.net to be able to use OpeJDK8 on debian:buster
-RUN curl -q https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add -
-RUN add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
-RUN apt-get -qq update && apt-get install -y adoptopenjdk-8-hotspot
-RUN update-alternatives --set java /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/bin/java
+RUN curl -q https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add -
+RUN add-apt-repository --yes https://packages.adoptium.net/artifactory/deb
+RUN apt-get -qq update && apt-get install -y temurin-8-jdk
+RUN update-alternatives --set java /usr/lib/jvm/temurin-8-jdk-amd64/bin/java
 
 # Set the work directory
 ########################