diff --git a/capif/templates/cd-deploy-ocf.gitlab-ci.yml b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
index 82dda3785c51eaebb8d93be32fa3c8675b4bb5d8..7efa650cee431a3baa700cfe2b91795745a15027 100644
--- a/capif/templates/cd-deploy-ocf.gitlab-ci.yml
+++ b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
@@ -57,34 +57,16 @@ deploy_ocf_staging:
       yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" helm/capif/Chart.yaml
       cat helm/capif/Chart.yaml
 
-      ### Chart mock-server###
-      yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" helm/capif/charts/mock-server/Chart.yaml
-      ### Chart nginx###
-      yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" helm/capif/charts/nginx/Chart.yaml
-      ### Chart ocf-access-control-policy###
-      yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" helm/capif/charts/ocf-access-control-policy/Chart.yaml
-      ### Chart ocf-api-invocation-logs###
-      yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" helm/capif/charts/ocf-api-invocation-logs/Chart.yaml
-      ### Chart ocf-api-invoker-management###
-      yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" helm/capif/charts/ocf-api-invoker-management/Chart.yaml
-      ### Chart ocf-api-provider-management###
-      yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" helm/capif/charts/ocf-api-provider-management/Chart.yaml
-      ### Chart ocf-auditing-api-logs###
-      yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" helm/capif/charts/ocf-auditing-api-logs/Chart.yaml
-      ### Chart ocf-discover-service-api###
-      yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" helm/capif/charts/ocf-discover-service-api/Chart.yaml
-      ### Chart ocf-events###
-      yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" helm/capif/charts/ocf-events/Chart.yaml
-      ### Chart ocf-helper###
-      yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" helm/capif/charts/ocf-helper/Chart.yaml
-      ### Chart ocf-publish-service-api###
-      yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" helm/capif/charts/ocf-publish-service-api/Chart.yaml
-      ### Chart ocf-register###
-      yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" helm/capif/charts/ocf-register/Chart.yaml
-      ### Chart ocf-routing-info###
-      yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" helm/capif/charts/ocf-routing-info/Chart.yaml
-      ### Chart ocf-security###
-      yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" helm/capif/charts/ocf-security/Chart.yaml
+      charts=("mock-server" "nginx" "ocf-access-control-policy" 
+        "ocf-api-invocation-logs" "ocf-api-invoker-management" 
+        "ocf-api-provider-management" "ocf-auditing-api-logs" 
+        "ocf-discover-service-api" "ocf-events" "ocf-helper" 
+        "ocf-publish-service-api" "ocf-register" "ocf-routing-info" 
+        "ocf-security")
+      
+      for chart in "${charts[@]}"; do
+        yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" "helm/capif/charts/$chart/Chart.yaml"
+      done
 
       echo "### download dependencies###"
       helm dependency build helm/capif
@@ -212,34 +194,17 @@ deploy_ocf_oficial_staging:
       yq e -i ".appVersion = \"staging\"" helm/capif/Chart.yaml
       cat helm/capif/Chart.yaml
 
-      ### Chart mock-server###
-      yq e -i ".appVersion = \"staging\"" helm/capif/charts/mock-server/Chart.yaml
-      ### Chart nginx###
-      yq e -i ".appVersion = \"staging\"" helm/capif/charts/nginx/Chart.yaml
-      ### Chart ocf-access-control-policy###
-      yq e -i ".appVersion = \"staging\"" helm/capif/charts/ocf-access-control-policy/Chart.yaml
-      ### Chart ocf-api-invocation-logs###
-      yq e -i ".appVersion = \"staging\"" helm/capif/charts/ocf-api-invocation-logs/Chart.yaml
-      ### Chart ocf-api-invoker-management###
-      yq e -i ".appVersion = \"staging\"" helm/capif/charts/ocf-api-invoker-management/Chart.yaml
-      ### Chart ocf-api-provider-management###
-      yq e -i ".appVersion = \"staging\"" helm/capif/charts/ocf-api-provider-management/Chart.yaml
-      ### Chart ocf-auditing-api-logs###
-      yq e -i ".appVersion = \"staging\"" helm/capif/charts/ocf-auditing-api-logs/Chart.yaml
-      ### Chart ocf-discover-service-api###
-      yq e -i ".appVersion = \"staging\"" helm/capif/charts/ocf-discover-service-api/Chart.yaml
-      ### Chart ocf-events###
-      yq e -i ".appVersion = \"staging\"" helm/capif/charts/ocf-events/Chart.yaml
-      ### Chart ocf-helper###
-      yq e -i ".appVersion = \"staging\"" helm/capif/charts/ocf-helper/Chart.yaml
-      ### Chart ocf-publish-service-api###
-      yq e -i ".appVersion = \"staging\"" helm/capif/charts/ocf-publish-service-api/Chart.yaml
-      ### Chart ocf-register###
-      yq e -i ".appVersion = \"staging\"" helm/capif/charts/ocf-register/Chart.yaml
-      ### Chart ocf-routing-info###
-      yq e -i ".appVersion = \"staging\"" helm/capif/charts/ocf-routing-info/Chart.yaml
-      ### Chart ocf-security###
-      yq e -i ".appVersion = \"staging\"" helm/capif/charts/ocf-security/Chart.yaml 
+      charts=("mock-server" "nginx" "ocf-access-control-policy" 
+        "ocf-api-invocation-logs" "ocf-api-invoker-management" 
+        "ocf-api-provider-management" "ocf-auditing-api-logs" 
+        "ocf-discover-service-api" "ocf-events" "ocf-helper" 
+        "ocf-publish-service-api" "ocf-register" "ocf-routing-info" 
+        "ocf-security")
+      
+      for chart in "${charts[@]}"; do
+        yq e -i ".appVersion = \"staging\"" "helm/capif/charts/$chart/Chart.yaml"
+      done
+
 
       echo "### download dependencies###"
       helm dependency build helm/capif
@@ -360,34 +325,17 @@ deploy_ocf_dev:
       yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/Chart.yaml
       cat helm/capif/Chart.yaml
 
-      ### Chart mock-server###
-      yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/charts/mock-server/Chart.yaml
-      ### Chart nginx###
-      yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/charts/nginx/Chart.yaml
-      ### Chart ocf-access-control-policy###
-      yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/charts/ocf-access-control-policy/Chart.yaml
-      ### Chart ocf-api-invocation-logs###
-      yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/charts/ocf-api-invocation-logs/Chart.yaml
-      ### Chart ocf-api-invoker-management###
-      yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/charts/ocf-api-invoker-management/Chart.yaml
-      ### Chart ocf-api-provider-management###
-      yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/charts/ocf-api-provider-management/Chart.yaml
-      ### Chart ocf-auditing-api-logs###
-      yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/charts/ocf-auditing-api-logs/Chart.yaml
-      ### Chart ocf-discover-service-api###
-      yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/charts/ocf-discover-service-api/Chart.yaml
-      ### Chart ocf-events###
-      yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/charts/ocf-events/Chart.yaml
-      ### Chart ocf-helper###
-      yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/charts/ocf-helper/Chart.yaml
-      ### Chart ocf-publish-service-api###
-      yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/charts/ocf-publish-service-api/Chart.yaml
-      ### Chart ocf-register###
-      yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/charts/ocf-register/Chart.yaml
-      ### Chart ocf-routing-info###
-      yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/charts/ocf-routing-info/Chart.yaml
-      ### Chart ocf-security###
-      yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/charts/ocf-security/Chart.yaml
+      charts=("mock-server" "nginx" "ocf-access-control-policy" 
+        "ocf-api-invocation-logs" "ocf-api-invoker-management" 
+        "ocf-api-provider-management" "ocf-auditing-api-logs" 
+        "ocf-discover-service-api" "ocf-events" "ocf-helper" 
+        "ocf-publish-service-api" "ocf-register" "ocf-routing-info" 
+        "ocf-security")
+      
+      for chart in "${charts[@]}"; do
+        yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" "helm/capif/charts/$chart/Chart.yaml"
+      done
+
 
       echo "### download dependencies###"
       helm dependency build helm/capif