diff --git a/capif/.gitlab-ci.yml b/capif/.gitlab-ci.yml
index b74c22523c159fb20656934c5693c0391f1116fc..96b1c95f94459ee20a233876ae45f32be7bbd81e 100644
--- a/capif/.gitlab-ci.yml
+++ b/capif/.gitlab-ci.yml
@@ -641,6 +641,11 @@ main_build_and_push:
    - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/vault:$CI_COMMIT_REF_SLUG .
    - 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/
+   - 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 "----------------------------------------------------"
    - docker logout $CI_REGISTRY
   <<: *main_common
 
diff --git a/capif/templates/ci_dev.gitlab-ci.yml b/capif/templates/ci_dev.gitlab-ci.yml
index e2fe2eb9ea5be1fdf2dd5de41b532e8a9a752712..ef23a9296c2e12ff777cb87f755553a332092acf 100644
--- a/capif/templates/ci_dev.gitlab-ci.yml
+++ b/capif/templates/ci_dev.gitlab-ci.yml
@@ -192,5 +192,10 @@ dev_build_and_push:
    - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/helper:$CI_COMMIT_REF_SLUG .
    - 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/
+   - 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 "----------------------------------------------------"
    - docker logout $CI_REGISTRY
   <<: *dev_common
diff --git a/capif/templates/ci_staging.gitlab-ci.yml b/capif/templates/ci_staging.gitlab-ci.yml
index c7dff70eb275ea17b8054b983605959542f86763..8294d998eb3a1918f5438ef8ca53ede0a7ed8e39 100644
--- a/capif/templates/ci_staging.gitlab-ci.yml
+++ b/capif/templates/ci_staging.gitlab-ci.yml
@@ -317,6 +317,11 @@ staging_build_and_push:
    - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/helper:$CI_COMMIT_REF_SLUG .
    - 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/
+   - 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 "----------------------------------------------------"
    - docker logout $CI_REGISTRY
   <<: *staging_common
 
@@ -403,4 +408,9 @@ staging_build_and_push_mr:
    - docker build -t $CI_REGISTRY/ocf/capif/staging/helper:staging .
    - docker push $CI_REGISTRY/ocf/capif/staging/helper:staging
    - echo "----------------------------------------------------"
+   - echo "### build and push mock-server image###"
+   - 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 "----------------------------------------------------"
    - docker logout $CI_REGISTRY
\ No newline at end of file