diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83c87311e0b27526e126b5b2e6c900af57c04acd..b244c0b471c692e405d27b3c21211e581e6dfdaf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -209,7 +209,8 @@ unit test workflow:
     variables:
         SERVICE_NAME: "workflow"
         PATH_PREFIX: "services/"
-        PATH_PREFIX2: "shared/workspaces/test/"
+        PATH_PREFIX2: "shared/workspaces/workspaces/"
+        TEST_PREFIX2: "shared/workspaces/test/"
     extends: .unit-test
 
 unit test capability:
@@ -218,7 +219,8 @@ unit test capability:
     variables:
         SERVICE_NAME: "capability"
         PATH_PREFIX: "services/"
-        PATH_PREFIX2: "shared/workspaces/test/"
+        PATH_PREFIX2: "shared/workspaces/workspaces/"
+        TEST_PREFIX2: "shared/workspaces/test/"
     extends: .unit-test
 
 unit test notification:
@@ -227,7 +229,8 @@ unit test notification:
     variables:
         SERVICE_NAME: "notification"
         PATH_PREFIX: "services/"
-        PATH_PREFIX2: "shared/workspaces/test/"
+        PATH_PREFIX2: "shared/workspaces/workspaces/"
+        TEST_PREFIX2: "shared/workspaces/test/"
     extends: .unit-test
 
 
diff --git a/ci/unit-test.template.yml b/ci/unit-test.template.yml
index 3490632f6f09fdd034c1afdf2074a63dd0ae320c..b1264fb2d768e087a1ca4aa8f27f5649e6a4bdc6 100644
--- a/ci/unit-test.template.yml
+++ b/ci/unit-test.template.yml
@@ -5,7 +5,7 @@
         - cd ${PATH_PREFIX}${SERVICE_NAME}
         # use the poetry virtual environment and packages
         - poetry install --with test
-        - $(poetry env info -p)/bin/pytest . ${PATH_PREFIX2}{SERVICE_NAME} --cov=${SERVICE_NAME} --cov-report=
+        - $(poetry env info -p)/bin/pytest . ${TEST_PREFIX2}{SERVICE_NAME} --cov=${SERVICE_NAME} --cov-report=
         - mv ./.coverage ${CI_PROJECT_DIR}/.coverage.${SERVICE_NAME}.${CI_COMMIT_SHORT_SHA}
     artifacts:
         paths:
@@ -21,6 +21,7 @@
             IMAGE_TAG: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
           changes:
             - ${PATH_PREFIX}${SERVICE_NAME}/**/*
+            - ${PATH_PREFIX2}${SERVICE_NAME}/*
         - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0.9]+-rc[0-9]+/'
           variables:
             IMAGE_TAG: $CI_COMMIT_TAG