diff --git a/capif/.gitlab-ci.yml b/capif/.gitlab-ci.yml
index 96b1c95f94459ee20a233876ae45f32be7bbd81e..9d8403c66e7c86f636a6c41d354a179c78a2a989 100644
--- a/capif/.gitlab-ci.yml
+++ b/capif/.gitlab-ci.yml
@@ -642,7 +642,7 @@ main_build_and_push:
    - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/vault:$CI_COMMIT_REF_SLUG
    - echo "----------------------------------------------------"
    - echo "### build and push mock-server image###"
-   - cd $TMP_PWD/services/mock-server/
+   - cd $TMP_PWD/services/mock_server/
    - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG .
    - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG
    - echo "----------------------------------------------------"
diff --git a/capif/templates/ci_dev.gitlab-ci.yml b/capif/templates/ci_dev.gitlab-ci.yml
index ef23a9296c2e12ff777cb87f755553a332092acf..ee2af58194ab0f1a75ce11402403444e0fa9e4bb 100644
--- a/capif/templates/ci_dev.gitlab-ci.yml
+++ b/capif/templates/ci_dev.gitlab-ci.yml
@@ -193,7 +193,7 @@ dev_build_and_push:
    - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/helper:$CI_COMMIT_REF_SLUG
    - echo "----------------------------------------------------"
    - echo "### build and push mock-server image###"
-   - cd $TMP_PWD/services/mock-server/
+   - cd $TMP_PWD/services/mock_server/
    - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG .
    - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG
    - echo "----------------------------------------------------"
diff --git a/capif/templates/ci_staging.gitlab-ci.yml b/capif/templates/ci_staging.gitlab-ci.yml
index 8294d998eb3a1918f5438ef8ca53ede0a7ed8e39..4d8358a9bb7c52998a88d39af8704b5609c72520 100644
--- a/capif/templates/ci_staging.gitlab-ci.yml
+++ b/capif/templates/ci_staging.gitlab-ci.yml
@@ -318,7 +318,7 @@ staging_build_and_push:
    - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/helper:$CI_COMMIT_REF_SLUG
    - echo "----------------------------------------------------"
    - echo "### build and push mock-server image###"
-   - cd $TMP_PWD/services/mock-server/
+   - cd $TMP_PWD/services/mock_server/
    - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG .
    - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG
    - echo "----------------------------------------------------"
@@ -409,7 +409,7 @@ staging_build_and_push_mr:
    - docker push $CI_REGISTRY/ocf/capif/staging/helper:staging
    - echo "----------------------------------------------------"
    - echo "### build and push mock-server image###"
-   - cd $TMP_PWD/services/mock-server/
+   - cd $TMP_PWD/services/mock_server/
    - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG .
    - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG
    - echo "----------------------------------------------------"