diff --git a/a2t-whisper/build.sh b/a2t-whisper/build.sh
index d99ab2f..ff43e5f 100755
--- a/a2t-whisper/build.sh
+++ b/a2t-whisper/build.sh
@@ -20,5 +20,5 @@ docker buildx build ${@:1} \
     --tag $IMAGE:$VERSION \
     .
 if test -z ${TESTS_SKIP_GPU+x}; then
-  docker run --rm $IMAGE:$VERSION pytest
+  docker run --rm --gpus all $IMAGE:$VERSION pytest
 fi
diff --git a/cht-dolly-v2/build.sh b/cht-dolly-v2/build.sh
index c86811e..b93c8a6 100755
--- a/cht-dolly-v2/build.sh
+++ b/cht-dolly-v2/build.sh
@@ -10,5 +10,5 @@ docker buildx build ${@:1} \
     --tag $IMAGE:$VERSION \
     .
 if test -z ${TESTS_SKIP_GPU+x}; then
-  docker run --gpus all $IMAGE:$VERSION pytest
+  docker run --rm --gpus all $IMAGE:$VERSION pytest
 fi
diff --git a/cht-falcon/build.sh b/cht-falcon/build.sh
index 136e2dd..52ab371 100755
--- a/cht-falcon/build.sh
+++ b/cht-falcon/build.sh
@@ -10,5 +10,5 @@ docker buildx build ${@:1} \
     --tag $IMAGE:$VERSION \
     .
 if test -z ${TESTS_SKIP_GPU+x}; then
-  docker run --gpus all $IMAGE:$VERSION pytest
+  docker run --rm --gpus all $IMAGE:$VERSION pytest
 fi
diff --git a/cht-gorilla/build.sh b/cht-gorilla/build.sh
index 42aeafe..4d8edb2 100755
--- a/cht-gorilla/build.sh
+++ b/cht-gorilla/build.sh
@@ -10,7 +10,7 @@ docker buildx build ${@:1} \
     --tag $IMAGE:$VERSION \
     .
 if test -z ${TESTS_SKIP_GPU+x}; then
-  docker run --gpus all $IMAGE:$VERSION pytest
+  docker run --rm --gpus all $IMAGE:$VERSION pytest
 fi
 
 IMAGE=ghcr.io/premai-io/chat-gorilla-mpt-7b-gpu
@@ -21,5 +21,5 @@ docker buildx build ${@:1} \
     --tag $IMAGE:$VERSION \
     .
 if test -z ${TESTS_SKIP_GPU+x}; then
-  docker run --gpus all $IMAGE:$VERSION pytest
+  docker run --rm --gpus all $IMAGE:$VERSION pytest
 fi
diff --git a/cht-mpt/build.sh b/cht-mpt/build.sh
index b79fc6c..0ce883d 100755
--- a/cht-mpt/build.sh
+++ b/cht-mpt/build.sh
@@ -10,7 +10,7 @@ docker buildx build ${@:1} \
     --tag $IMAGE:$VERSION \
     .
 if test -z ${TESTS_SKIP_GPU+x}; then
-  docker run --gpus all $IMAGE:$VERSION pytest
+  docker run --rm --gpus all $IMAGE:$VERSION pytest
 fi
 
 IMAGE=ghcr.io/premai-io/mpt-7b-gpu
diff --git a/cht-xgen/build.sh b/cht-xgen/build.sh
index 62a0abc..c438a3d 100755
--- a/cht-xgen/build.sh
+++ b/cht-xgen/build.sh
@@ -10,5 +10,5 @@ docker buildx build ${@:1} \
     --tag $IMAGE:$VERSION \
     .
 if test -z ${TESTS_SKIP_GPU+x}; then
-  docker run --gpus all $IMAGE:$VERSION pytest
+  docker run --rm --gpus all $IMAGE:$VERSION pytest
 fi