diff --git a/api/docker_start.sh b/api/docker_start.sh
index 82c82dad924330cd31a46af5b2c38db8bce40444..ebd910e781c4bd778598f89a04dbfa6d4db0bfb2 100755
--- a/api/docker_start.sh
+++ b/api/docker_start.sh
@@ -9,15 +9,16 @@ if [ $# = 1 ] && [ $1 = "-test" ]; then
   # We always execute from src (For consistency with uWSGI)
   cd src
   uname -a
+  export COVERAGE_REPORT_DIR=${COVERAGE_REPORT_DIR:=../coverage}
   export VIDEOAG_TEST_CONFIG_OVERRIDE="../config/test_config_override.py"
   python -V
   python -m coverage run --data-file "../coverage/.data" run_tests.py ||
     { echo "Test failed!"; exit 1; }
   python -m coverage report --data-file "../coverage/.data" --include "./*" ||
     { echo "Coverage report stdout failed"; exit 1; }
-  python -m coverage report --data-file "../coverage/.data" -m --include "./*" > ../coverage/report.txt ||
+  python -m coverage report --data-file "../coverage/.data" -m --include "./*" > $COVERAGE_REPORT_DIR/report.txt ||
     { echo "Coverage report report.txt failed"; exit 1; }
-  python -m coverage html -d "../coverage/html/" --data-file "../coverage/.data" --include "./*" ||
+  python -m coverage html -d "$COVERAGE_REPORT_DIR/html/" --data-file "../coverage/.data" --include "./*" ||
     { echo "Coverage report html failed"; exit 1; }
 else
   echo "Running uWSGI"
diff --git a/build_pipeline_generator.py b/build_pipeline_generator.py
index 96271e234b9c8fc2b11bd57534add676e057c3cc..f6197a3fdf238c91cd9519d1941543262432ac47 100644
--- a/build_pipeline_generator.py
+++ b/build_pipeline_generator.py
@@ -159,7 +159,7 @@ RUN pip install {pip_requirement_list_arg}
         return self.context.build_dir.joinpath(".dockerfiles").joinpath(self.target_image_name)
     
     def image_full_name(self):
-        return f"{self.context.env_type()}/{self.target_image_name}"
+        return f"{self.context.env_type()}_{self.target_image_name}"
     
     def ci_build_job_name(self):
         return f"build-{self.target_image_name}"