diff --git a/Dockerfile-base b/Dockerfile-base
index ac1ce45ae3e667f647e2e8adc08faee482e878d3..fa6d2f2e6a5371db99c95ddbcdcc9eac245295ee 100644
--- a/Dockerfile-base
+++ b/Dockerfile-base
@@ -1,4 +1,4 @@
-FROM cern/cs8-base:latest
+FROM registry.cern.ch/docker.io/cern/cs8-base:latest
 
 ENV LANG=en_US.utf8 LC_ALL=en_US.utf8
 
diff --git a/docker/activemq/5.16.0-alpine/Dockerfile b/docker/activemq/5.16.0-alpine/Dockerfile
index f2f1defec4ac94f65b8a6d3a3c62b83ba948b3de..040dd907ad6091f2c37e1c450734e0dafceec9b7 100644
--- a/docker/activemq/5.16.0-alpine/Dockerfile
+++ b/docker/activemq/5.16.0-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-jre-alpine
+FROM registry.cern.ch/docker.io/library/openjdk:8-jre-alpine
 
 ENV ACTIVEMQ_VERSION 5.16.0
 ENV ACTIVEMQ apache-activemq-$ACTIVEMQ_VERSION