diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index ef3d06024d4816321aa902a8c9793fd4e35b6f8f..0b2f8f7c2a3acec4948ca50cb45a3d9a401d89de 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -91,6 +91,9 @@ DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) XAUTHORITY=$(XAUTHORITY) TANGO_HOST=$(
 pull: ## pull the images from the Docker hub
 	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) pull
 
+build: ## rebuild images
+	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) build
+
 up: minimal  ## start the base TANGO system and prepare all services
 	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) up --no-start
 
diff --git a/docker-compose/itango.yml b/docker-compose/itango.yml
index c7006a60fc753562a35bc9cbd79ec83991affd0f..efc5495048eddb1d44c4d476c32e5381df478e58 100644
--- a/docker-compose/itango.yml
+++ b/docker-compose/itango.yml
@@ -14,7 +14,10 @@ version: '2'
 
 services:
   itango:
-    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:latest
+    build:
+        context: lofar-itango
+        args:
+            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:latest
     container_name: ${CONTAINER_NAME_PREFIX}itango
     network_mode: ${NETWORK_MODE}
     volumes:
diff --git a/docker-compose/lofar-itango/Dockerfile b/docker-compose/lofar-itango/Dockerfile
index 4bef1ebc469e4d6b3a5c4317ac420444033840ca..196b4f786b0683a949b56f33f62aae8d9e642ca4 100644
--- a/docker-compose/lofar-itango/Dockerfile
+++ b/docker-compose/lofar-itango/Dockerfile
@@ -1,3 +1,4 @@
-FROM nexus.engageska-portugal.pt/ska-docker/tango-itango:latest
+ARG SOURCE_IMAGE
+FROM ${SOURCE_IMAGE}
 
 RUN pip3 install "opcua >= 0.98.9" astropy