diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30e9d83a450b47318091d0128bebfa74211d0b76..00f0a87c7eee5190d0e3b0bc966e97b9be712f41 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,4 +17,4 @@ job-native-build:
 # Cross-compile the project for the TL-WDR4900 router
 job-cross-compilation:
   script:
-    - docker compose run cross-compilation /home/user/iot-firewall/docker_cmd.sh tl-wdr4900 $(id -u $USER) $(id -g $USER)
+    - docker compose run --rm --remove-orphans cross-compilation /home/user/iot-firewall/docker_cmd.sh tl-wdr4900 $(id -u $(whoami)) $(id -g $(whoami))