diff --git a/scripts/docker/entrypoint.sh b/scripts/docker/entrypoint.sh
index 074d9c2d..f2a1a64e 100755
--- a/scripts/docker/entrypoint.sh
+++ b/scripts/docker/entrypoint.sh
@@ -21,7 +21,7 @@ cleanup() {
     # Wait for processes to terminate.
     wait
 }
-trap cleanup INT TERM
+trap cleanup INT TERM EXIT
 
 dind dockerd &
 echo "Waiting for Docker in Docker to be ready..."