diff --git a/test-build.bat b/test-build.bat
index c5a6ed1..d0faeb7 100644
--- a/test-build.bat
+++ b/test-build.bat
@@ -1,6 +1,8 @@
 docker build . --tag test-image --file Dockerfile
 docker build . --tag debug-image --file Dockerfile.debug
-docker stop MPE_Egnyte_*
-docker rm MPE_Egnyte_*
+docker stop MPE_Egnyte_Test
+docker rm MPE_Egnyte_Test
+docker stop MPE_Egnyte_Debug
+docker rm MPE_Egnyte_Debug
 docker run -d --publish 15054:10000 --name MPE_Egnyte_Test test-image
-docker run -d --publish 15053:10000 --publish 4000:4000 --name MPE_Egnyte_Debug test-image
+docker run -d --publish 15053:10000 --publish 4000:4000 --name MPE_Egnyte_Debug debug-image
diff --git a/test-build.sh b/test-build.sh
index ff692dd..52deb6f 100644
--- a/test-build.sh
+++ b/test-build.sh
@@ -1,7 +1,9 @@
 #! /bin/bash
 docker build . --tag test-image --file Dockerfile
 docker build . --tag debug-image --file Dockerfile.debug
-docker stop MPE_Egnyte_*
-docker rm MPE_Egnyte_*
+docker stop MPE_Egnyte_Test
+docker rm MPE_Egnyte_Test
+docker stop MPE_Egnyte_Debug
+docker rm MPE_Egnyte_Debug
 docker run -d --publish 15054:10000 --name MPE_Egnyte_Test test-image
 docker run -d --publish 15053:10000 --publish 4000:4000 --name MPE_Egnyte_Debug debug-image