diff --git a/README.md b/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..122433f15f23f0d01ba627c278af6393e77e2619
--- /dev/null
+++ b/README.md
@@ -0,0 +1,54 @@
+# Pipeline Scripts
+
+## Overview
+
+This repository contains CI/CD pipeline configurations and scripts for **CAPIF** and **SDK** projects. These pipelines automate the build, test, and deployment processes, ensuring consistent and reliable software delivery across both projects.
+
+## Contents
+
+### CAPIF Pipelines
+CI/CD pipeline configurations for the CAPIF project, including build automation, testing, and deployment workflows.
+
+### SDK Pipelines
+CI/CD pipeline configurations for the SDK project, including build automation, testing, and deployment workflows.
+
+## Features
+
+- Automated build and test execution
+- Consistent deployment processes
+- Multi-project support (CAPIF and SDK)
+- Version control integration
+
+## Release Notes
+
+### [v5.0.1]
+
+#### Added
+- Initial pipeline scripts setup
+- CAPIF CI/CD pipeline configuration
+- SDK CI/CD pipeline configuration
+
+#### Changed
+- CAPIF pipelines adapted to use installation scripts provided by capif repository.
+    - Included generation of environment file and publication at pipeline.
+    - temporaly support to old CI/CD on deployment.
+    - New variables related with production and development environments.
+- Included generation of new Open Discover API service component image.
+
+#### Fixed
+- N/A
+
+#### Deprecated
+- N/A
+
+#### Removed
+- N/A
+
+#### Security
+- N/A
+
+---
+
+### [Version History]
+
+Document your pipeline changes and updates here following the [Keep a Changelog](https://keepachangelog.com/) format.
diff --git a/capif/.gitlab-ci.yml b/capif/.gitlab-ci.yml
index 1d7ca29e3c0482c2cde229a59102c3543f9bb6a8..d450707ad83888619189182adb55338701e06e55 100644
--- a/capif/.gitlab-ci.yml
+++ b/capif/.gitlab-ci.yml
@@ -234,93 +234,98 @@ main_build_and_push:
     CI_REGISTRY_USER: $CI_REGISTRY_USER
     CI_REGISTRY: $CI_REGISTRY
     CAPIF_DOCKER_REGISTRY: $CAPIF_DOCKER_REGISTRY
-  script:
-   - export TMP_PWD=$PWD
-   - echo "TMP_PWD=$TMP_PWD"
-   - echo "### docker login###"
-   - echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
-   - echo "----------------------------------------------------"
-   - echo "### build and push nginx image###"
-   - cd $TMP_PWD/services/nginx/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push register image###"
-   - cd $TMP_PWD/services/register/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Access_Control_Policy_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Access_Control_Policy_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_API_Invoker_Management_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_API_Invoker_Management_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_API_Provider_Management_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_API_Provider_Management_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-provider-management-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-provider-management-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Auditing_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Auditing_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-auditing-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-auditing-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Discover_Service_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Discover_Service_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-discover-service-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-discover-service-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Events_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Events_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-events-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-events-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Logging_API_Invocation_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Logging_API_Invocation_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Publish_Service_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Publish_Service_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-publish-service-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-publish-service-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Routing_Info_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Routing_Info_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-routing-info-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-routing-info-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Security_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Security_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-security-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-security-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push vault image###"
-   - cd $TMP_PWD/services/vault/
-   - 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 helper image###"
-   - cd $TMP_PWD/services/helper/
-   - 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 "----------------------------------------------------"
-   - echo "### build and push celery image###"
-   - cd $TMP_PWD/services/celery/
-   - 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
+  script: |
+          export TMP_PWD=$PWD
+          echo "TMP_PWD=$TMP_PWD"
+          echo "### docker login###"
+          echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
+          echo "----------------------------------------------------"
+          echo "### build and push nginx image###"
+          cd $TMP_PWD/services/nginx/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push register image###"
+          cd $TMP_PWD/services/register/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Access_Control_Policy_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Access_Control_Policy_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_API_Invoker_Management_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_API_Invoker_Management_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_API_Provider_Management_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_API_Provider_Management_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-provider-management-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-provider-management-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Auditing_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Auditing_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-auditing-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-auditing-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Discover_Service_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Discover_Service_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-discover-service-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-discover-service-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Events_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Events_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-events-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-events-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Logging_API_Invocation_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Logging_API_Invocation_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Publish_Service_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Publish_Service_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-publish-service-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-publish-service-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Routing_Info_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Routing_Info_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-routing-info-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-routing-info-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Security_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Security_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-security-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-security-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push vault image###"
+          cd $TMP_PWD/services/vault/
+          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 helper image###"
+          cd $TMP_PWD/services/helper/
+          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 "----------------------------------------------------"
+          echo "### build and push celery image###"
+          cd $TMP_PWD/services/celery/
+          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 "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Open_Discover_Service_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Open_Discover_Service_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-open-discover-service-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-open-discover-service-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          docker logout $CI_REGISTRY
   <<: *main_common
 
 cvs_nginx:
@@ -563,6 +568,24 @@ cvs_celery:
     SECURE_LOG_LEVEL: debug
   <<: *main_dnd
 
+cvs_ocf_open_discover_service_api:
+  stage: main_container_scanning
+  needs:
+    - main_build_and_push
+  before_script:
+   - export TMP_PWD=$PWD
+   - echo "TMP_PWD=$TMP_PWD"
+   - git clone https://oauth2:${CI_JOB_TOKEN}@labs.etsi.org/rep/ocf/capif.git
+  extends: container_scanning
+  variables:
+    CS_DEFAULT_BRANCH_IMAGE: "$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-open-discover-service-api:$CI_COMMIT_REF_SLUG"
+    CS_IMAGE: "$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-open-discover-service-api:$CI_COMMIT_REF_SLUG"
+    CS_REGISTRY_USER: $CI_REGISTRY_USER
+    CS_REGISTRY_PASSWORD: $CAPIF_DOCKER_REGISTRY
+    SECURE_LOG_LEVEL: debug
+  <<: *main_dnd
+
+
 deploy_ocf_main:
   stage: deploy_ocf_main
   before_script:
@@ -585,6 +608,7 @@ deploy_ocf_main:
     - cvs_ocf_publish_service_api
     - cvs_ocf_routing_info_api
     - cvs_ocf_security_api
+    - cvs_ocf_open_discover_service_api
     - cvs_vault
     - cvs_celery
   <<: *main_common
diff --git a/capif/templates/cd-deploy-ocf.gitlab-ci.yml b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
index fcc0446646348181b401ed0e1c8accad00bc5e04..10f1039197045672c2e0e4a859cdd3c26f7e9f30 100644
--- a/capif/templates/cd-deploy-ocf.gitlab-ci.yml
+++ b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
@@ -775,6 +775,8 @@ deploy_ocf_dev:
 #    - if: $CI_COMMIT_BRANCH
   script:
     - |
+      set -x
+      echo "### deploying ocf to dev environment ###" > deploy_dev.log
       helm version
       kubectl version --output=yaml
       echo "### setting kubeconfig###"
@@ -1022,12 +1024,15 @@ deploy_ocf_dev:
         ./helm/scripts/install_capif.sh $NAMESPACE_DEV
         kubectl delete pod --field-selector=status.phase=Failed -n $NAMESPACE_DEV
         kubectl delete pod --field-selector=status.phase=Succeeded -n $NAMESPACE_DEV
-
+        echo "NAMESPACE_DEV=$NAMESPACE_DEV"
+        ls -l helm/scripts/envs/
+        ls -l helm/scripts/envs/ >> deploy_dev.log
       fi
   artifacts:
     name: "$NAMESPACE_DEV.template"
     paths:
       - helm/scripts/envs/$NAMESPACE_DEV.template
+      - deploy_dev.log
     expire_in: 1 day
     when: always
 
diff --git a/capif/templates/ci_dev.gitlab-ci.yml b/capif/templates/ci_dev.gitlab-ci.yml
index baa82e6e31c2c5fa9464f75f5ada2a7fb04bf445..fbfb966c7d9d0ce63ba5dbda146e24afd33b23b8 100644
--- a/capif/templates/ci_dev.gitlab-ci.yml
+++ b/capif/templates/ci_dev.gitlab-ci.yml
@@ -86,9 +86,13 @@ dev_linting_docker:
     ../hadolint --version    
 
     # Array of service names
-    SERVICES=("celery" "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")
+    SERVICES=("helper" "mock_server" "celery" "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" 
+      "TS29222_CAPIF_Open_Discover_Service_API")
 
     # Loop over service names
     for SERVICE in "${SERVICES[@]}"; do
@@ -123,92 +127,96 @@ dev_build_and_push:
     - dev_linting_code
     - dev_linting_docker
   stage: dev_build_and_push
-  script:
-   - export TMP_PWD=$PWD
-   - echo "TMP_PWD=$TMP_PWD"
-   - echo "### docker login###"
-   - echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
-   - echo "----------------------------------------------------"
-   - echo "### build and push nginx image###"
-   - cd $TMP_PWD/services/nginx/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push register image###"
-   - cd $TMP_PWD/services/register/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Access_Control_Policy_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Access_Control_Policy_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_API_Invoker_Management_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_API_Invoker_Management_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_API_Provider_Management_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_API_Provider_Management_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-provider-management-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-provider-management-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Auditing_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Auditing_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-auditing-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-auditing-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Discover_Service_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Discover_Service_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-discover-service-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-discover-service-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Events_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Events_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-events-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-events-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Logging_API_Invocation_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Logging_API_Invocation_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Publish_Service_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Publish_Service_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-publish-service-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-publish-service-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Routing_Info_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Routing_Info_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-routing-info-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-routing-info-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Security_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Security_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-security-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-security-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push vault image###"
-   - cd $TMP_PWD/services/vault/
-   - 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 helper image###"
-   - cd $TMP_PWD/services/helper/
-   - 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 "----------------------------------------------------"
-   - echo "### build and push celery image###"
-   - cd $TMP_PWD/services/celery/
-   - 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
+  script: |
+          export TMP_PWD=$PWD
+          echo "TMP_PWD=$TMP_PWD"
+          echo "### docker login###"
+          echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
+          echo "----------------------------------------------------"
+          echo "### build and push nginx image###"
+          cd $TMP_PWD/services/nginx/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push register image###"
+          cd $TMP_PWD/services/register/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Access_Control_Policy_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Access_Control_Policy_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_API_Invoker_Management_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_API_Invoker_Management_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_API_Provider_Management_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_API_Provider_Management_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-provider-management-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-provider-management-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Auditing_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Auditing_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-auditing-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-auditing-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Discover_Service_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Discover_Service_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-discover-service-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-discover-service-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Events_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Events_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-events-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-events-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Logging_API_Invocation_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Logging_API_Invocation_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Publish_Service_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Publish_Service_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-publish-service-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-publish-service-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Routing_Info_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Routing_Info_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-routing-info-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-routing-info-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Security_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Security_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-security-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-security-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push vault image###"
+          cd $TMP_PWD/services/vault/
+          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 helper image###"
+          cd $TMP_PWD/services/helper/
+          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 "----------------------------------------------------"
+          echo "### build and push celery image###"
+          cd $TMP_PWD/services/celery/
+          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 "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Open_Discover_Service_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Open_Discover_Service_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-open-discover-service-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-open-discover-service-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          docker logout $CI_REGISTRY
   <<: *dev_common
\ No newline at end of file
diff --git a/capif/templates/ci_staging.gitlab-ci.yml b/capif/templates/ci_staging.gitlab-ci.yml
index ff560e09c0b2e67a425b29ad46055e017c19da03..e732a8b7b4c91abf3a64904bda615143aebbce78 100644
--- a/capif/templates/ci_staging.gitlab-ci.yml
+++ b/capif/templates/ci_staging.gitlab-ci.yml
@@ -98,10 +98,13 @@ staging_linting_docker:
     ../hadolint --version    
 
     # Array of service names
-    SERVICES=("celery" "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")
+    SERVICES=("helper" "mock_server" "celery" "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" 
+      "TS29222_CAPIF_Open_Discover_Service_API")
 
     # Loop over service names
     for SERVICE in "${SERVICES[@]}"; do
@@ -160,10 +163,13 @@ staging_grype_cvs:
     echo "TMP_PWD=$TMP_PWD"
     
     # Array of image names
-    IMAGE_NAMES=("nginx" "celery" "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")
+    IMAGE_NAMES=("helper" "mock_server" "celery" "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" 
+      "TS29222_CAPIF_Open_Discover_Service_API")
     
     # Loop over image names
     for IMAGE_NAME in "${IMAGE_NAMES[@]}"; do
@@ -241,93 +247,98 @@ staging_build_and_push:
     - staging_semgrep_sast
     - staging_grype_cvs
   stage: staging_build_and_push
-  script:
-   - export TMP_PWD=$PWD
-   - echo "TMP_PWD=$TMP_PWD"
-   - echo "### docker login###"
-   - echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
-   - echo "----------------------------------------------------"
-   - echo "### build and push nginx image###"
-   - cd $TMP_PWD/services/nginx/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push register image###"
-   - cd $TMP_PWD/services/register/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Access_Control_Policy_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Access_Control_Policy_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_API_Invoker_Management_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_API_Invoker_Management_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_API_Provider_Management_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_API_Provider_Management_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-provider-management-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-provider-management-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Auditing_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Auditing_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-auditing-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-auditing-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Discover_Service_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Discover_Service_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-discover-service-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-discover-service-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Events_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Events_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-events-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-events-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Logging_API_Invocation_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Logging_API_Invocation_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Publish_Service_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Publish_Service_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-publish-service-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-publish-service-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Routing_Info_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Routing_Info_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-routing-info-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-routing-info-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Security_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Security_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-security-api:$CI_COMMIT_REF_SLUG .
-   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-security-api:$CI_COMMIT_REF_SLUG
-   - echo "----------------------------------------------------"
-   - echo "### build and push vault image###"
-   - cd $TMP_PWD/services/vault/
-   - 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 helper image###"
-   - cd $TMP_PWD/services/helper/
-   - 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 "----------------------------------------------------"
-   - echo "### build and push celery image###"
-   - cd $TMP_PWD/services/celery/
-   - 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
+  script: |
+          export TMP_PWD=$PWD
+          echo "TMP_PWD=$TMP_PWD"
+          echo "### docker login###"
+          echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
+          echo "----------------------------------------------------"
+          echo "### build and push nginx image###"
+          cd $TMP_PWD/services/nginx/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push register image###"
+          cd $TMP_PWD/services/register/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Access_Control_Policy_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Access_Control_Policy_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_API_Invoker_Management_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_API_Invoker_Management_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_API_Provider_Management_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_API_Provider_Management_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-provider-management-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-provider-management-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Auditing_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Auditing_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-auditing-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-auditing-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Discover_Service_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Discover_Service_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-discover-service-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-discover-service-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Events_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Events_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-events-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-events-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Logging_API_Invocation_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Logging_API_Invocation_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Publish_Service_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Publish_Service_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-publish-service-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-publish-service-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Routing_Info_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Routing_Info_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-routing-info-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-routing-info-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Security_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Security_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-security-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-security-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          echo "### build and push vault image###"
+          cd $TMP_PWD/services/vault/
+          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 helper image###"
+          cd $TMP_PWD/services/helper/
+          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 "----------------------------------------------------"
+          echo "### build and push celery image###"
+          cd $TMP_PWD/services/celery/
+          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 "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Open_Discover_Service_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Open_Discover_Service_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-open-discover-service-api:$CI_COMMIT_REF_SLUG .
+          docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-open-discover-service-api:$CI_COMMIT_REF_SLUG
+          echo "----------------------------------------------------"
+          docker logout $CI_REGISTRY
   <<: *staging_common
 
 ### staging branch merged ###
@@ -339,90 +350,95 @@ staging_build_and_push_mr:
       when: always
   tags:
     - shell
-  script:
-   - export TMP_PWD=$PWD
-   - echo "TMP_PWD=$TMP_PWD"
-   - echo "### docker login###"
-   - echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
-   - echo "----------------------------------------------------"
-   - echo "### build and push nginx image###"
-   - cd $TMP_PWD/services/nginx/
-   - docker build -t $CI_REGISTRY/ocf/capif/staging/nginx:staging .
-   - docker push $CI_REGISTRY/ocf/capif/staging/nginx:staging
-   - echo "----------------------------------------------------"
-   - echo "### build and push register image###"
-   - cd $TMP_PWD/services/register/
-   - docker build -t $CI_REGISTRY/ocf/capif/staging/register:staging .
-   - docker push $CI_REGISTRY/ocf/capif/staging/register:staging
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Access_Control_Policy_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Access_Control_Policy_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-access-control-policy-api:staging .
-   - docker push $CI_REGISTRY/ocf/capif/staging/ocf-access-control-policy-api:staging
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_API_Invoker_Management_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_API_Invoker_Management_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-api-invoker-management-api:staging .
-   - docker push $CI_REGISTRY/ocf/capif/staging/ocf-api-invoker-management-api:staging
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_API_Provider_Management_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_API_Provider_Management_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-api-provider-management-api:staging .
-   - docker push $CI_REGISTRY/ocf/capif/staging/ocf-api-provider-management-api:staging
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Auditing_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Auditing_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-auditing-api:staging .
-   - docker push $CI_REGISTRY/ocf/capif/staging/ocf-auditing-api:staging
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Discover_Service_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Discover_Service_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-discover-service-api:staging .
-   - docker push $CI_REGISTRY/ocf/capif/staging/ocf-discover-service-api:staging
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Events_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Events_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-events-api:staging .
-   - docker push $CI_REGISTRY/ocf/capif/staging/ocf-events-api:staging
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Logging_API_Invocation_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Logging_API_Invocation_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-logging-api-invocation-api:staging .
-   - docker push $CI_REGISTRY/ocf/capif/staging/ocf-logging-api-invocation-api:staging
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Publish_Service_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Publish_Service_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-publish-service-api:staging .
-   - docker push $CI_REGISTRY/ocf/capif/staging/ocf-publish-service-api:staging
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Routing_Info_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Routing_Info_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-routing-info-api:staging .
-   - docker push $CI_REGISTRY/ocf/capif/staging/ocf-routing-info-api:staging
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Security_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Security_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-security-api:staging .
-   - docker push $CI_REGISTRY/ocf/capif/staging/ocf-security-api:staging
-   - echo "----------------------------------------------------"
-   - echo "### build and push vault image###"
-   - cd $TMP_PWD/services/vault/
-   - docker build -t $CI_REGISTRY/ocf/capif/staging/vault:staging .
-   - docker push $CI_REGISTRY/ocf/capif/staging/vault:staging
-   - echo "----------------------------------------------------"
-   - echo "### build and push helper image###"
-   - cd $TMP_PWD/services/helper/
-   - 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 "----------------------------------------------------"
-   - echo "### build and push celery image###"
-   - cd $TMP_PWD/services/celery/
-   - 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
+  script: |
+          export TMP_PWD=$PWD
+          echo "TMP_PWD=$TMP_PWD"
+          echo "### docker login###"
+          echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
+          echo "----------------------------------------------------"
+          echo "### build and push nginx image###"
+          cd $TMP_PWD/services/nginx/
+          docker build -t $CI_REGISTRY/ocf/capif/staging/nginx:staging .
+          docker push $CI_REGISTRY/ocf/capif/staging/nginx:staging
+          echo "----------------------------------------------------"
+          echo "### build and push register image###"
+          cd $TMP_PWD/services/register/
+          docker build -t $CI_REGISTRY/ocf/capif/staging/register:staging .
+          docker push $CI_REGISTRY/ocf/capif/staging/register:staging
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Access_Control_Policy_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Access_Control_Policy_API/
+          docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-access-control-policy-api:staging .
+          docker push $CI_REGISTRY/ocf/capif/staging/ocf-access-control-policy-api:staging
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_API_Invoker_Management_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_API_Invoker_Management_API/
+          docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-api-invoker-management-api:staging .
+          docker push $CI_REGISTRY/ocf/capif/staging/ocf-api-invoker-management-api:staging
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_API_Provider_Management_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_API_Provider_Management_API/
+          docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-api-provider-management-api:staging .
+          docker push $CI_REGISTRY/ocf/capif/staging/ocf-api-provider-management-api:staging
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Auditing_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Auditing_API/
+          docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-auditing-api:staging .
+          docker push $CI_REGISTRY/ocf/capif/staging/ocf-auditing-api:staging
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Discover_Service_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Discover_Service_API/
+          docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-discover-service-api:staging .
+          docker push $CI_REGISTRY/ocf/capif/staging/ocf-discover-service-api:staging
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Events_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Events_API/
+          docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-events-api:staging .
+          docker push $CI_REGISTRY/ocf/capif/staging/ocf-events-api:staging
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Logging_API_Invocation_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Logging_API_Invocation_API/
+          docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-logging-api-invocation-api:staging .
+          docker push $CI_REGISTRY/ocf/capif/staging/ocf-logging-api-invocation-api:staging
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Publish_Service_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Publish_Service_API/
+          docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-publish-service-api:staging .
+          docker push $CI_REGISTRY/ocf/capif/staging/ocf-publish-service-api:staging
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Routing_Info_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Routing_Info_API/
+          docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-routing-info-api:staging .
+          docker push $CI_REGISTRY/ocf/capif/staging/ocf-routing-info-api:staging
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Security_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Security_API/
+          docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-security-api:staging .
+          docker push $CI_REGISTRY/ocf/capif/staging/ocf-security-api:staging
+          echo "----------------------------------------------------"
+          echo "### build and push vault image###"
+          cd $TMP_PWD/services/vault/
+          docker build -t $CI_REGISTRY/ocf/capif/staging/vault:staging .
+          docker push $CI_REGISTRY/ocf/capif/staging/vault:staging
+          echo "----------------------------------------------------"
+          echo "### build and push helper image###"
+          cd $TMP_PWD/services/helper/
+          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/staging/mock-server:staging .
+          docker push $CI_REGISTRY/ocf/capif/staging/mock-server:staging
+          echo "----------------------------------------------------"
+          echo "### build and push celery image###"
+          cd $TMP_PWD/services/celery/
+          docker build -t $CI_REGISTRY/ocf/capif/staging/celery:staging .
+          docker push $CI_REGISTRY/ocf/capif/staging/celery:staging
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Open_Discover_Service_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Open_Discover_Service_API/
+          docker build -t $CI_REGISTRY/ocf/capif/staging/ocf-open-discover-service-api:staging .
+          docker push $CI_REGISTRY/ocf/capif/staging/ocf-open-discover-service-api:staging
+          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 1918ea1e7130556c92f4947997254d64b4df9e6b..b6f6ab513ee89c42bb356142853315517915d5cc 100644
--- a/capif/templates/cicd-deploy-release.gitlab-ci.yml
+++ b/capif/templates/cicd-deploy-release.gitlab-ci.yml
@@ -29,93 +29,98 @@ prod_build_and_push:
     - when: never
   tags:
     - shell
-  script:
-   - export TMP_PWD=$PWD
-   - echo "TMP_PWD=$TMP_PWD"
-   - echo "### docker login###"
-   - echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
-   - echo "----------------------------------------------------"
-   - echo "### build and push nginx image###"
-   - cd $TMP_PWD/services/nginx/
-   - docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/nginx:$CI_COMMIT_TAG .
-   - docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/nginx:$CI_COMMIT_TAG
-   - echo "----------------------------------------------------"
-   - echo "### build and push register image###"
-   - cd $TMP_PWD/services/register/
-   - docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/register:$CI_COMMIT_TAG .
-   - docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/register:$CI_COMMIT_TAG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Access_Control_Policy_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Access_Control_Policy_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-access-control-policy-api:$CI_COMMIT_TAG .
-   - docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-access-control-policy-api:$CI_COMMIT_TAG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_API_Invoker_Management_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_API_Invoker_Management_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-api-invoker-management-api:$CI_COMMIT_TAG .
-   - docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-api-invoker-management-api:$CI_COMMIT_TAG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_API_Provider_Management_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_API_Provider_Management_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-api-provider-management-api:$CI_COMMIT_TAG .
-   - docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-api-provider-management-api:$CI_COMMIT_TAG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Auditing_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Auditing_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-auditing-api:$CI_COMMIT_TAG .
-   - docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-auditing-api:$CI_COMMIT_TAG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Discover_Service_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Discover_Service_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-discover-service-api:$CI_COMMIT_TAG .
-   - docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-discover-service-api:$CI_COMMIT_TAG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Events_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Events_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-events-api:$CI_COMMIT_TAG .
-   - docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-events-api:$CI_COMMIT_TAG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Logging_API_Invocation_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Logging_API_Invocation_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-logging-api-invocation-api:$CI_COMMIT_TAG .
-   - docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-logging-api-invocation-api:$CI_COMMIT_TAG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Publish_Service_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Publish_Service_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-publish-service-api:$CI_COMMIT_TAG .
-   - docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-publish-service-api:$CI_COMMIT_TAG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Routing_Info_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Routing_Info_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-routing-info-api:$CI_COMMIT_TAG .
-   - docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-routing-info-api:$CI_COMMIT_TAG
-   - echo "----------------------------------------------------"
-   - echo "### build and push TS29222_CAPIF_Security_API image###"
-   - cd $TMP_PWD/services/TS29222_CAPIF_Security_API/
-   - docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-security-api:$CI_COMMIT_TAG .
-   - docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-security-api:$CI_COMMIT_TAG
-   - echo "----------------------------------------------------"
-   - echo "### build and push vault image###"
-   - cd $TMP_PWD/services/vault/
-   - docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/vault:$CI_COMMIT_TAG .
-   - docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/vault:$CI_COMMIT_TAG
-   - echo "----------------------------------------------------"
-   - echo "### build and push helper image###"
-   - cd $TMP_PWD/services/helper/
-   - docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/helper:$CI_COMMIT_TAG .
-   - docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/helper:$CI_COMMIT_TAG
-   - echo "----------------------------------------------------"
-   - echo "### build and push mock-server image###"
-   - cd $TMP_PWD/services/mock_server/
-   - 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
-   - echo "----------------------------------------------------"
-   - echo "### build and push celery image###"
-   - cd $TMP_PWD/services/celery/
-   - 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
+  script: |
+          export TMP_PWD=$PWD
+          echo "TMP_PWD=$TMP_PWD"
+          echo "### docker login###"
+          echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
+          echo "----------------------------------------------------"
+          echo "### build and push nginx image###"
+          cd $TMP_PWD/services/nginx/
+          docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/nginx:$CI_COMMIT_TAG .
+          docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/nginx:$CI_COMMIT_TAG
+          echo "----------------------------------------------------"
+          echo "### build and push register image###"
+          cd $TMP_PWD/services/register/
+          docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/register:$CI_COMMIT_TAG .
+          docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/register:$CI_COMMIT_TAG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Access_Control_Policy_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Access_Control_Policy_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-access-control-policy-api:$CI_COMMIT_TAG .
+          docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-access-control-policy-api:$CI_COMMIT_TAG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_API_Invoker_Management_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_API_Invoker_Management_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-api-invoker-management-api:$CI_COMMIT_TAG .
+          docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-api-invoker-management-api:$CI_COMMIT_TAG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_API_Provider_Management_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_API_Provider_Management_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-api-provider-management-api:$CI_COMMIT_TAG .
+          docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-api-provider-management-api:$CI_COMMIT_TAG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Auditing_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Auditing_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-auditing-api:$CI_COMMIT_TAG .
+          docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-auditing-api:$CI_COMMIT_TAG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Discover_Service_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Discover_Service_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-discover-service-api:$CI_COMMIT_TAG .
+          docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-discover-service-api:$CI_COMMIT_TAG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Events_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Events_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-events-api:$CI_COMMIT_TAG .
+          docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-events-api:$CI_COMMIT_TAG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Logging_API_Invocation_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Logging_API_Invocation_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-logging-api-invocation-api:$CI_COMMIT_TAG .
+          docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-logging-api-invocation-api:$CI_COMMIT_TAG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Publish_Service_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Publish_Service_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-publish-service-api:$CI_COMMIT_TAG .
+          docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-publish-service-api:$CI_COMMIT_TAG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Routing_Info_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Routing_Info_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-routing-info-api:$CI_COMMIT_TAG .
+          docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-routing-info-api:$CI_COMMIT_TAG
+          echo "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Security_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Security_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-security-api:$CI_COMMIT_TAG .
+          docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-security-api:$CI_COMMIT_TAG
+          echo "----------------------------------------------------"
+          echo "### build and push vault image###"
+          cd $TMP_PWD/services/vault/
+          docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/vault:$CI_COMMIT_TAG .
+          docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/vault:$CI_COMMIT_TAG
+          echo "----------------------------------------------------"
+          echo "### build and push helper image###"
+          cd $TMP_PWD/services/helper/
+          docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/helper:$CI_COMMIT_TAG .
+          docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/helper:$CI_COMMIT_TAG
+          echo "----------------------------------------------------"
+          echo "### build and push mock-server image###"
+          cd $TMP_PWD/services/mock_server/
+          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
+          echo "----------------------------------------------------"
+          echo "### build and push celery image###"
+          cd $TMP_PWD/services/celery/
+          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 "----------------------------------------------------"
+          echo "### build and push TS29222_CAPIF_Open_Discover_Service_API image###"
+          cd $TMP_PWD/services/TS29222_CAPIF_Open_Discover_Service_API/
+          docker build -t $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-open-discover-service-api:$CI_COMMIT_TAG .
+          docker push $CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-open-discover-service-api:$CI_COMMIT_TAG
+          echo "----------------------------------------------------"
+          docker logout $CI_REGISTRY
 
 
 deploy_ocf_prod: