diff --git a/ci/scripts/build_and_test.sh b/ci/scripts/build_and_test.sh
index a90a788611009080e6139c891021bfe077b82b0a..1776e342230b339da4e1e0c4937fff2c794b5608 100755
--- a/ci/scripts/build_and_test.sh
+++ b/ci/scripts/build_and_test.sh
@@ -32,6 +32,7 @@ HYSOP_BUILD_DIR="${HYSOP_DIR}/build"
 HYSOP_INSTALL_DIR='/opt/hysop'
 
 cp -r /hysop "${HYSOP_DIR}"
+find -name '*.sh' -exec sed -i 's/\r//' '{}' \;
 rm -rf "${HYSOP_BUILD_DIR}"
 
 SCRIPT_DIR="${HYSOP_DIR}/ci/scripts"
diff --git a/ci/utils/run_ci.bat b/ci/utils/run_ci.bat
index e6d0628ee06f24af5a6c3778dc14df6ac69cb65f..243b5ada00121bc96a27399aae94ffff63a1a9ed 100644
--- a/ci/utils/run_ci.bat
+++ b/ci/utils/run_ci.bat
@@ -16,6 +16,9 @@ docker create %EXTRA_ARGS% -v "%SCRIPT_DIR%\..\..:/hysop:ro" --name=%CONTAINER_I
 
 docker start %CONTAINER_ID%
 
-docker exec %CONTAINER_ID% /usr/bin/bash /hysop/ci/scripts/build_and_test.sh
+docker exec %CONTAINER_ID% /hysop/ci/scripts/build_and_test.sh
 
 docker commit %CONTAINER_ID% %DOCKER_IMG%
+
+docker stop %CONTAINER_ID%
+docker rm %CONTAINER_ID%
diff --git a/ci/utils/run_debug.bat b/ci/utils/run_debug.bat
new file mode 100644
index 0000000000000000000000000000000000000000..6e206338abb01fc63980f3cc306b4ef83e86398a
--- /dev/null
+++ b/ci/utils/run_debug.bat
@@ -0,0 +1,24 @@
+pushd %~dp0
+set SCRIPT_DIR=%CD%
+popd
+
+set "HYSOP_REGISTRY_URL=gricad-registry.univ-grenoble-alpes.fr"
+if "%~1" NEQ "" (set DOCKER_IMAGE_TAG=%~1) else (set DOCKER_IMAGE_TAG=jammy)
+set "DOCKER_IMAGE_TAG_POSTFIX=%DOCKER_IMAGE_TAG:~-4%"
+IF "%DOCKER_IMAGE_TAG_POSTFIX%" == "cuda" (set "EXTRA_ARGS=--gpus all") else (set "EXTRA_ARGS=")
+set "DOCKER_IMG=%HYSOP_REGISTRY_URL%/particle_methods/hysop:%DOCKER_IMAGE_TAG%"
+set "CONTAINER_ID=hysop_build_and_test"
+
+docker stop %CONTAINER_ID%
+docker rm %CONTAINER_ID%
+
+docker create %EXTRA_ARGS% -v "%SCRIPT_DIR%\..\..:/hysop:ro" --name=%CONTAINER_ID% -it %DOCKER_IMG%
+
+docker start %CONTAINER_ID%
+
+docker exec %CONTAINER_ID% /hysop/ci/scripts/build_and_debug.sh
+
+docker commit %CONTAINER_ID% %DOCKER_IMG%
+
+docker stop %CONTAINER_ID%
+docker rm %CONTAINER_ID%