diff --git a/apps/cic-eth/.gitlab-ci.yml b/apps/cic-eth/.gitlab-ci.yml
index ddd2adc5..45fb000a 100644
--- a/apps/cic-eth/.gitlab-ci.yml
+++ b/apps/cic-eth/.gitlab-ci.yml
@@ -3,35 +3,29 @@
         APP_NAME: cic-eth
         DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile
 
-# build-mr-cic-eth:
-#     extends:
-#         - .py_build_merge_request
-#         - .cic_eth_variables
-
-build-mr-unittest-cic-eth:
-    extends:
-        - .cic_eth_variables
-        - .py_build_unittest_merge_request
+.cic_eth_changes_target:
     rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    #   changes:
-    #   - $CONTEXT/$APP_NAME/**/*
+        changes:
+        - $CONTEXT/$APP_NAME/**/*
       when: always
 
+
+build-mr-cic-eth:
+    extends:
+        - .cic_eth_variables
+        - .cic_eth_changes_target
+        - .py_build_target_test
+
 test-mr-cic-eth:
     extends:
         - .cic_eth_variables
+        - .cic_eth_changes_target
     stage: test
     image: $CI_REGISTRY_IMAGE/$APP_NAME-test:latest
     script:
         - cd apps/$APP_NAME/
-        - pytest tests/unit/
-    rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    #   changes:
-    #   - $CONTEXT/$APP_NAME/**/*
-      when: always
-    
+        - pytest tests/unit/ 
 
 build-push-cic-eth:
     extends:
diff --git a/ci_templates/.cic-template.yml b/ci_templates/.cic-template.yml
index 355d3fdd..a1bd4c8f 100644
--- a/ci_templates/.cic-template.yml
+++ b/ci_templates/.cic-template.yml
@@ -18,7 +18,7 @@ variables:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       when: always
 
-.py_build_unittest_merge_request:
+.py_build_target_test:
   stage: build
   variables:
     CI_DEBUG_TRACE: "true"
@@ -30,20 +30,6 @@ variables:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       when: always
 
-
-# .py_unittest_merge_request:
-#   stage: test
-#   image: $CI_REGISTRY_IMAGE/$APP_NAME-test:latest
-#   script:
-#     - ls
-#     - pwd
-#     - env
-#     - cd apps/$APP_NAME/
-#     - pytest
-#   rules:
-#     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-#       when: always
-
 .py_build_push:
   stage: build
   variables: