diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index 0b2f8f7c2a3acec4948ca50cb45a3d9a401d89de..8162167c737abb2fc2a97bbc29489d1e6f103d00 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -92,6 +92,8 @@ pull: ## pull the images from the Docker hub
 	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) pull
 
 build: ## rebuild images
+	# docker-compose does not support build dependencies, so manage those here
+	$(DOCKER_COMPOSE_ARGS) docker-compose -f lofar-device-base.yml build
 	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) build
 
 up: minimal  ## start the base TANGO system and prepare all services
diff --git a/docker-compose/device-pcc.yml b/docker-compose/device-pcc.yml
index 9054e10c3d7b97d4650ba802ac72a370eff44f34..db4848121748f5cc0c819ca88c7df06f5bb54265 100644
--- a/docker-compose/device-pcc.yml
+++ b/docker-compose/device-pcc.yml
@@ -14,11 +14,11 @@ version: '2'
 
 services:
   device-pcc:
-    image: docker-compose_lofar-device-base:latest
+    image: lofar-device-base
     container_name: ${CONTAINER_NAME_PREFIX}device-pcc
     network_mode: ${NETWORK_MODE}
     volumes:
-        - ${TANGO_LOFAR_CONTAINER_DIR}:/opt/lofar
+        - ${TANGO_LOFAR_CONTAINER_MOUNT}
     environment:
       - TANGO_HOST=${TANGO_HOST}
     entrypoint:
@@ -27,4 +27,4 @@ services:
       - --timeout=30
       - --strict
       - --
-      - python3 -u /opt/lofar/PCC/PCC LTS -v
+      - python3 -u ${TANGO_LOFAR_CONTAINER_DIR}/PCC/PCC LTS -v
diff --git a/docker-compose/device-sdp.yml b/docker-compose/device-sdp.yml
index 47dac31233e8761620f01ec519cf64a947ff649f..8671d8666c18e03ce929dc4faa8576975681deda 100644
--- a/docker-compose/device-sdp.yml
+++ b/docker-compose/device-sdp.yml
@@ -14,11 +14,11 @@ version: '2'
 
 services:
   device-sdp:
-    image: docker-compose_lofar-device-base:latest
+    image: lofar-device-base
     container_name: ${CONTAINER_NAME_PREFIX}device-sdp
     network_mode: ${NETWORK_MODE}
     volumes:
-        - ${TANGO_LOFAR_CONTAINER_DIR}:/opt/lofar
+        - ${TANGO_LOFAR_CONTAINER_MOUNT}
     environment:
       - TANGO_HOST=${TANGO_HOST}
     entrypoint:
@@ -27,4 +27,4 @@ services:
       - --timeout=30
       - --strict
       - --
-      - python3 -u /opt/lofar/SDP/SDP LTS -v
+      - python3 -u ${TANGO_LOFAR_CONTAINER_DIR}/SDP/SDP LTS -v
diff --git a/docker-compose/lofar-device-base.yml b/docker-compose/lofar-device-base.yml
index a88304ec5280c46bf202960886cdb5a0786459c3..3d40f0f63554222907e6094bc61f1342cc8fabfa 100644
--- a/docker-compose/lofar-device-base.yml
+++ b/docker-compose/lofar-device-base.yml
@@ -14,6 +14,7 @@ version: '2'
 
 services:
   lofar-device-base:
+    image: lofar-device-base
     build:
         context: lofar-device-base
     container_name: ${CONTAINER_NAME_PREFIX}lofar-device-base