diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index 94bbd94d98e558532b3a2e80b1a7c7f11f0b3d82..693bc26cbe78a45ead288c49ed2929ca7944c920 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -82,7 +82,7 @@ endif
 
 DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) XAUTHORITY=$(XAUTHORITY) TANGO_HOST=$(TANGO_HOST) \
 		NETWORK_MODE=$(NETWORK_MODE) XAUTHORITY_MOUNT=$(XAUTHORITY_MOUNT) TANGO_SKA_CONTAINER_MOUNT=$(TANGO_SKA_CONTAINER_MOUNT) TANGO_LOFAR_CONTAINER_MOUNT=$(TANGO_LOFAR_CONTAINER_MOUNT) TANGO_LOFAR_CONTAINER_DIR=${TANGO_LOFAR_CONTAINER_DIR} MYSQL_HOST=$(MYSQL_HOST) \
-		CONTAINER_NAME_PREFIX=$(CONTAINER_NAME_PREFIX) COMPOSE_IGNORE_ORPHANS=true LOFAR_UID=$(shell id -u)
+		CONTAINER_NAME_PREFIX=$(CONTAINER_NAME_PREFIX) COMPOSE_IGNORE_ORPHANS=true CONTAINER_EXECUTION_UID=$(shell id -u)
 
 
 .PHONY: up down minimal start stop status clean pull help
diff --git a/docker-compose/device-pcc.yml b/docker-compose/device-pcc.yml
index 6b149a77b83b89d9c279915d171c3d9e75a88522..97c744339339351943aedd6bb5318233c0286793 100644
--- a/docker-compose/device-pcc.yml
+++ b/docker-compose/device-pcc.yml
@@ -21,7 +21,7 @@ services:
         - ${TANGO_LOFAR_CONTAINER_MOUNT}
     environment:
       - TANGO_HOST=${TANGO_HOST}
-    user: ${LOFAR_UID}
+    user: ${CONTAINER_EXECUTION_UID}
     entrypoint:
       - /usr/local/bin/wait-for-it.sh
       - ${TANGO_HOST}
diff --git a/docker-compose/device-sdp.yml b/docker-compose/device-sdp.yml
index 293c38c1e7ab8d4e1110517e4ea7f9ce2835361b..4d908cf89b858db78cdb431bd55645046ea58f0c 100644
--- a/docker-compose/device-sdp.yml
+++ b/docker-compose/device-sdp.yml
@@ -21,7 +21,7 @@ services:
         - ${TANGO_LOFAR_CONTAINER_MOUNT}
     environment:
       - TANGO_HOST=${TANGO_HOST}
-    user: ${LOFAR_UID}
+    user: ${CONTAINER_EXECUTION_UID}
     entrypoint:
       - /usr/local/bin/wait-for-it.sh
       - ${TANGO_HOST}
diff --git a/docker-compose/jupyter.yml b/docker-compose/jupyter.yml
index d5aed24ccc81771651997cba207a3a22b5a606ee..96448d54530fa241572f27efbad475e13c23abcb 100644
--- a/docker-compose/jupyter.yml
+++ b/docker-compose/jupyter.yml
@@ -26,7 +26,7 @@ services:
       - DISPLAY=${DISPLAY}
     ports:
       - "8888:8888"
-    user: ${LOFAR_UID}
+    user: ${CONTAINER_EXECUTION_UID}
     working_dir: /jupyter-notebooks
     entrypoint:
       - /usr/local/bin/wait-for-it.sh