diff --git a/bin/start-jive.sh b/bin/start-jive.sh
index 06fa7e09a17c79951d36f5c44aa32104005ff55b..fcbb9f8b5e95a4bbbfb6b2895c30d4d2a1914340 100755
--- a/bin/start-jive.sh
+++ b/bin/start-jive.sh
@@ -28,7 +28,7 @@ else
 fi
 
 #docker run --rm -it --network host ${OPTIONS} nexus.engageska-portugal.pt/ska-docker/tango-java:latest ${command} ${@}
-container_name=nexus.engageska-portugal.pt/ska-docker/tango-java:latest
+container_name=artefact.skatelescope.org/ska-tango-images/tango-java:9.3.3.2
 container=$(docker ps | egrep ${container_name} | cut -d' ' -f1)
 if [ ! -z ${container} ]; then
     docker exec -it ${container} ${command} ${@}
diff --git a/docker-compose/.env b/docker-compose/.env
index bf415f70a3466cd1dcdf87437e8d4e97758f6087..c46981dca5f0a013e34444e2eec6f29fbad26bf4 100644
--- a/docker-compose/.env
+++ b/docker-compose/.env
@@ -1,2 +1,2 @@
-DOCKER_REGISTRY_HOST=nexus.engageska-portugal.pt
-DOCKER_REGISTRY_USER=ska-docker
+DOCKER_REGISTRY_HOST=artefact.skatelescope.org
+DOCKER_REGISTRY_USER=ska-tango-images
diff --git a/docker-compose/itango/Dockerfile b/docker-compose/itango/Dockerfile
index d0305710bdd63b76002e928185a21bcedd4d7902..010d408bae1c1714af978fd5aec71d775d36d1cc 100644
--- a/docker-compose/itango/Dockerfile
+++ b/docker-compose/itango/Dockerfile
@@ -1,6 +1,6 @@
-ARG VERSION=latest
-ARG DOCKER_REGISTRY_HOST=nexus.engageska-portugal.pt
-ARG DOCKER_REGISTRY_USER=ska-docker
+ARG VERSION=9.3.3.7
+ARG DOCKER_REGISTRY_HOST=artefact.skatelescope.org
+ARG DOCKER_REGISTRY_USER=ska-tango-images
 FROM $DOCKER_REGISTRY_HOST/$DOCKER_REGISTRY_USER/tango-itango:${VERSION}
 
 RUN sudo apt-get -y update && \
diff --git a/docker-compose/jupyter/Dockerfile b/docker-compose/jupyter/Dockerfile
index 62fb7395184b9bc9f4540c8ad68acabc5dc26713..aa10824264aaa8de72a0e2fd20fbbc7bd2193f75 100644
--- a/docker-compose/jupyter/Dockerfile
+++ b/docker-compose/jupyter/Dockerfile
@@ -1,5 +1,5 @@
-ARG VERSION=latest
-FROM nexus.engageska-portugal.pt/ska-docker/tango-itango:${VERSION}
+ARG VERSION=9.3.3.7
+FROM artefact.skatelescope.org/ska-tango-images/tango-itango:${VERSION}
 
 # UID if the user that this container will run under. This is needed to give directories
 # that are needed for temporary storage the proper owner and access rights.
diff --git a/docker-compose/lofar-device-base/Dockerfile b/docker-compose/lofar-device-base/Dockerfile
index e0b6efd3d2e44f7f6f92283ede8916c70d7b8aaf..ddf83de3642ccfddd09ccb2e98a71d69c2d3d799 100644
--- a/docker-compose/lofar-device-base/Dockerfile
+++ b/docker-compose/lofar-device-base/Dockerfile
@@ -1,4 +1,5 @@
-FROM nexus.engageska-portugal.pt/ska-docker/tango-itango:latest
+ARG VERSION=9.3.3.7
+FROM artefact.skatelescope.org/ska-tango-images/tango-itango:${VERSION}
 
 RUN sudo apt-get update && sudo apt-get install -y git && sudo apt-get clean