diff --git a/docker-compose/itango.yml b/docker-compose/itango.yml
index a5fe11565b73824eb51e973f9b754c916de2c5a3..ef825b5c20526f2db03e8d03f26bbdf5c145ee5c 100644
--- a/docker-compose/itango.yml
+++ b/docker-compose/itango.yml
@@ -15,7 +15,7 @@ version: '2'
 services:
   itango:
     build:
-        context: lofar-itango
+        context: itango
         args:
             SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:latest
     container_name: ${CONTAINER_NAME_PREFIX}itango
diff --git a/docker-compose/lofar-itango/Dockerfile b/docker-compose/itango/Dockerfile
similarity index 100%
rename from docker-compose/lofar-itango/Dockerfile
rename to docker-compose/itango/Dockerfile
diff --git a/docker-compose/lofar-jupyter.yml b/docker-compose/jupyter.yml
similarity index 88%
rename from docker-compose/lofar-jupyter.yml
rename to docker-compose/jupyter.yml
index a7406773f8ea3ce501541e23c00d4251d48ee1f2..1a690384f387ec883bf2a87e73736fa3b1d125af 100644
--- a/docker-compose/lofar-jupyter.yml
+++ b/docker-compose/jupyter.yml
@@ -15,9 +15,7 @@ version: '2'
 services:
   jupyter:
     build:
-        context: lofar-jupyter
-        args:
-            SOURCE_IMAGE: lofar-itango:latest
+        context: jupyter
     container_name: ${CONTAINER_NAME_PREFIX}jupyter
     network_mode: ${NETWORK_MODE}
     volumes:
diff --git a/docker-compose/lofar-jupyter/Dockerfile b/docker-compose/jupyter/Dockerfile
similarity index 93%
rename from docker-compose/lofar-jupyter/Dockerfile
rename to docker-compose/jupyter/Dockerfile
index 849f5ff3adde0acbf9a8bbec3d7c4a60a9551c70..96fbec4987d8597380d2cf902b5c846b479f6462 100644
--- a/docker-compose/lofar-jupyter/Dockerfile
+++ b/docker-compose/jupyter/Dockerfile
@@ -1,5 +1,5 @@
 ARG VERSION=latest
-FROM lofar-itango:${VERSION}
+FROM nexus.engageska-portugal.pt/ska-docker/tango-itango:${VERSION}
 
 RUN pip3 install jupyter
 RUN pip3 install ipykernel
diff --git a/docker-compose/lofar-jupyter/ipython-profiles/stationcontrol-jupyter/ipython_config.py b/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/ipython_config.py
similarity index 100%
rename from docker-compose/lofar-jupyter/ipython-profiles/stationcontrol-jupyter/ipython_config.py
rename to docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/ipython_config.py
diff --git a/docker-compose/lofar-jupyter/ipython-profiles/stationcontrol-jupyter/startup/00-tango.py b/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/00-tango.py
similarity index 100%
rename from docker-compose/lofar-jupyter/ipython-profiles/stationcontrol-jupyter/startup/00-tango.py
rename to docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/00-tango.py
diff --git a/docker-compose/lofar-jupyter/ipython-profiles/stationcontrol-jupyter/startup/README b/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/README
similarity index 100%
rename from docker-compose/lofar-jupyter/ipython-profiles/stationcontrol-jupyter/startup/README
rename to docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/README
diff --git a/docker-compose/lofar-jupyter/jupyter-kernels/stationcontrol/kernel.json b/docker-compose/jupyter/jupyter-kernels/stationcontrol/kernel.json
similarity index 100%
rename from docker-compose/lofar-jupyter/jupyter-kernels/stationcontrol/kernel.json
rename to docker-compose/jupyter/jupyter-kernels/stationcontrol/kernel.json