diff --git a/capif/templates/ci_dev.gitlab-ci.yml b/capif/templates/ci_dev.gitlab-ci.yml
index c32ff815dbbe7eb9ef6ebdd32c44a73033cded70..e2fe2eb9ea5be1fdf2dd5de41b532e8a9a752712 100644
--- a/capif/templates/ci_dev.gitlab-ci.yml
+++ b/capif/templates/ci_dev.gitlab-ci.yml
@@ -88,7 +88,7 @@ dev_linting_docker:
     ../hadolint --version    
 
     # Array of service names
-    SERVICES=("capif-client" "vault" "nginx" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API" 
+    SERVICES=("vault" "nginx" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API" 
       "TS29222_CAPIF_API_Provider_Management_API" "TS29222_CAPIF_Auditing_API" "TS29222_CAPIF_Discover_Service_API" "TS29222_CAPIF_Events_API" 
       "TS29222_CAPIF_Logging_API_Invocation_API" "TS29222_CAPIF_Publish_Service_API" "TS29222_CAPIF_Routing_Info_API" "TS29222_CAPIF_Security_API"
       "vault")
diff --git a/capif/templates/ci_main.gitlab-ci.yml b/capif/templates/ci_main.gitlab-ci.yml
index ce020a89410daf68636a21d68c641e29b9df189c..556a3b7b54140a7d9f251d34a60f74bfe7b2c2cf 100644
--- a/capif/templates/ci_main.gitlab-ci.yml
+++ b/capif/templates/ci_main.gitlab-ci.yml
@@ -60,7 +60,7 @@ main_linting_docker:
     ../hadolint --version    
 
     # Array of service names
-    SERVICES=("capif-client" "vault" "nginx" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API" 
+    SERVICES=("vault" "nginx" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API" 
       "TS29222_CAPIF_API_Provider_Management_API" "TS29222_CAPIF_Auditing_API" "TS29222_CAPIF_Discover_Service_API" "TS29222_CAPIF_Events_API" 
       "TS29222_CAPIF_Logging_API_Invocation_API" "TS29222_CAPIF_Publish_Service_API" "TS29222_CAPIF_Routing_Info_API" "TS29222_CAPIF_Security_API"
       "vault")
@@ -112,7 +112,7 @@ main_cvs:
     echo "TMP_PWD=$TMP_PWD"
     
     # Array of image names
-    IMAGE_NAMES=("capif-client" "nginx" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API"
+    IMAGE_NAMES=("nginx" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API"
       "TS29222_CAPIF_API_Provider_Management_API" "TS29222_CAPIF_Auditing_API" "TS29222_CAPIF_Discover_Service_API"
       "TS29222_CAPIF_Events_API" "TS29222_CAPIF_Logging_API_Invocation_API" "TS29222_CAPIF_Publish_Service_API"
       "TS29222_CAPIF_Routing_Info_API" "TS29222_CAPIF_Security_API" "vault")
@@ -158,11 +158,6 @@ main_build_and_push:
   script:
    - export TMP_PWD=$PWD
    - echo "TMP_PWD=$TMP_PWD"
-   - echo "### build and push capif-client image###"
-#   - cd services/capif-client/
-#   - docker login --username $CI_REGISTRY_USER --password $CAPIF_DOCKER_REGISTRY $CI_REGISTRY
-#   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/capif-client:latest .
-#   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/capif-client:latest
 #   - echo "----------------------------------------------------"
 #   - echo "### build and push nginx image###"
 #   - cd $TMP_PWD/services/nginx/
diff --git a/capif/templates/ci_staging.gitlab-ci.yml b/capif/templates/ci_staging.gitlab-ci.yml
index b6d15c6ff03ca55068359a905f04dce10b71273b..c7dff70eb275ea17b8054b983605959542f86763 100644
--- a/capif/templates/ci_staging.gitlab-ci.yml
+++ b/capif/templates/ci_staging.gitlab-ci.yml
@@ -98,7 +98,7 @@ staging_linting_docker:
     ../hadolint --version    
 
     # Array of service names
-    SERVICES=("capif-client" "vault" "nginx" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API" 
+    SERVICES=("vault" "nginx" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API" 
       "TS29222_CAPIF_API_Provider_Management_API" "TS29222_CAPIF_Auditing_API" "TS29222_CAPIF_Discover_Service_API" "TS29222_CAPIF_Events_API" 
       "TS29222_CAPIF_Logging_API_Invocation_API" "TS29222_CAPIF_Publish_Service_API" "TS29222_CAPIF_Routing_Info_API" "TS29222_CAPIF_Security_API"
       "vault")
@@ -160,7 +160,7 @@ staging_grype_cvs:
     echo "TMP_PWD=$TMP_PWD"
     
     # Array of image names
-    IMAGE_NAMES=("capif-client" "nginx" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API"
+    IMAGE_NAMES=("nginx" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API"
       "TS29222_CAPIF_API_Provider_Management_API" "TS29222_CAPIF_Auditing_API" "TS29222_CAPIF_Discover_Service_API"
       "TS29222_CAPIF_Events_API" "TS29222_CAPIF_Logging_API_Invocation_API" "TS29222_CAPIF_Publish_Service_API"
       "TS29222_CAPIF_Routing_Info_API" "TS29222_CAPIF_Security_API" "vault")