diff --git a/capif/.gitlab-ci.yml b/capif/.gitlab-ci.yml
index 85f0c5eb74f4da186af232b501cff1a8efa6bc1a..5114d23b271f035231ac40ab0e53ebcf825d84dd 100644
--- a/capif/.gitlab-ci.yml
+++ b/capif/.gitlab-ci.yml
@@ -309,8 +309,8 @@ main_build_and_push:
    - echo "----------------------------------------------------"
    - echo "### build and push celery image###"
    - cd $TMP_PWD/services/celery/
-   - 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
+   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/celery:$CI_COMMIT_REF_SLUG .
+   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/celery:$CI_COMMIT_REF_SLUG
    - echo "----------------------------------------------------"   
    - docker logout $CI_REGISTRY
   <<: *main_common
diff --git a/capif/templates/ci_staging.gitlab-ci.yml b/capif/templates/ci_staging.gitlab-ci.yml
index 462105bd9a07cb62c0f2a7a46bc298379a7f2235..ff560e09c0b2e67a425b29ad46055e017c19da03 100644
--- a/capif/templates/ci_staging.gitlab-ci.yml
+++ b/capif/templates/ci_staging.gitlab-ci.yml
@@ -324,8 +324,8 @@ staging_build_and_push:
    - echo "----------------------------------------------------"
    - echo "### build and push celery image###"
    - cd $TMP_PWD/services/celery/
-   - 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
+   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/celery:$CI_COMMIT_REF_SLUG .
+   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/celery:$CI_COMMIT_REF_SLUG
    - echo "----------------------------------------------------"   
    - docker logout $CI_REGISTRY
   <<: *staging_common
@@ -422,7 +422,7 @@ staging_build_and_push_mr:
    - echo "----------------------------------------------------"
    - echo "### build and push celery image###"
    - cd $TMP_PWD/services/celery/
-   - 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
+   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/celery:$CI_COMMIT_REF_SLUG .
+   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/celery:$CI_COMMIT_REF_SLUG
    - echo "----------------------------------------------------"
    - docker logout $CI_REGISTRY
\ No newline at end of file
diff --git a/capif/templates/cicd-deploy-release.gitlab-ci.yml b/capif/templates/cicd-deploy-release.gitlab-ci.yml
index baa1eed905827b8b52ee56877c17e84dfcd5486f..2771ec4104466ae44e5c34a7187d2a279ccc7a22 100644
--- a/capif/templates/cicd-deploy-release.gitlab-ci.yml
+++ b/capif/templates/cicd-deploy-release.gitlab-ci.yml
@@ -112,8 +112,8 @@ prod_build_and_push:
    - echo "----------------------------------------------------"
    - echo "### build and push celery image###"
    - cd $TMP_PWD/services/celery/
-   - docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/mock-server:$CI_COMMIT_TAG .
-   - docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/mock-server:$CI_COMMIT_TAG
+   - docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/celery:$CI_COMMIT_TAG .
+   - docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/celery:$CI_COMMIT_TAG
    - echo "----------------------------------------------------"   
    - docker logout $CI_REGISTRY