diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90047317296511eac6b3ea80c2c26681c791b2cf..e9c2af5e1651231b1e6d7952dedf702a80236a52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -114,9 +114,6 @@ unit test dev workflow:
     variables:
         SERVICE_NAME: "workflow"
     extends: .unit-test
-    artifacts:
-        paths:
-        - .coverage.${SERVICE_NAME}.${CI_COMMIT_SHORT_SHA}
     needs:
         - build dev workflow
 
@@ -125,9 +122,6 @@ unit test dev capability:
     variables:
         SERVICE_NAME: "capability"
     extends: .unit-test
-    artifacts:
-        paths:
-        - .coverage.${SERVICE_NAME}.${CI_COMMIT_SHORT_SHA}
     needs:
         - build dev capability
 
@@ -136,9 +130,6 @@ unit test dev notification:
     variables:
         SERVICE_NAME: "notification"
     extends: .unit-test
-    artifacts:
-        paths:
-        - .coverage.${SERVICE_NAME}.${CI_COMMIT_SHORT_SHA}
     needs:
         - build dev notification
 
@@ -166,9 +157,7 @@ unit test coverage:
       - unit test dev notification
     rules:
         - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-          when: always
         - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-          when: always
 
 # Push Stages
 push dev workflow:
@@ -248,7 +237,6 @@ pages:
         expire_in: 2 weeks
     rules:
         - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-          when: always
 
 # Development 
 deploy dev:
diff --git a/ci/unit-test.template.yml b/ci/unit-test.template.yml
index 62b5d9a8769c61272a5608934ede488844046fed..f4f27f878f9ebf9981eeb9d299eb0a2a98cafd16 100644
--- a/ci/unit-test.template.yml
+++ b/ci/unit-test.template.yml
@@ -1,12 +1,12 @@
 .unit-test:
+    image: ${REGISTRY_URL}/${PROJECT_NAME}/${SERVICE_NAME}:${CI_COMMIT_SHORT_SHA}
     script:
-        - IMAGE_NAME="${REGISTRY_URL}/${PROJECT_NAME}/${SERVICE_NAME}"
-        - TEST_CONTAINER="${SERVICE_NAME}-${CI_COMMIT_SHORT_SHA}"
-        - docker run --name "${TEST_CONTAINER}" ${IMAGE_NAME}:${CI_COMMIT_SHORT_SHA} ./bin/run-tests.sh -b
-        - docker cp "${TEST_CONTAINER}":/code/.coverage ./.coverage.${SERVICE_NAME}.${CI_COMMIT_SHORT_SHA}
-        - docker container stop "${TEST_CONTAINER}" && docker container rm "${TEST_CONTAINER}"
+        - cd /code && ./bin/run-tests.sh -b
+        - ls -la
+        - mv .coverage .coverage.${SERVICE_NAME}.${CI_COMMIT_SHORT_SHA}
+    artifacts:
+        paths:
+          - .coverage.${SERVICE_NAME}.${CI_COMMIT_SHORT_SHA}
     rules:
         - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-          when: always
-        - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-          when: always
\ No newline at end of file
+        - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
\ No newline at end of file