diff --git a/capif/templates/cd-deploy-ocf.gitlab-ci.yml b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
index c55ff67d04f175018806191a1199a0cf895be172..b65ac74ec9c4f44af09912cdf9b22500959d8cb4 100644
--- a/capif/templates/cd-deploy-ocf.gitlab-ci.yml
+++ b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
@@ -228,7 +228,7 @@ deploy_ocf_staging:
       --set mock-server.ingress.hosts[0].paths[0].pathType="Prefix" \
       --set mock-server.env.logLevel="DEBUG" \
       --set mongo.image.repository=labs.etsi.org:5050/ocf/capif/mongo \
-      --set mongo.image.tag=6.0.2 \      
+      --set mongo.image.tag=6.0.2 \
       --set mongo-register-express.enabled=true \
       --set mongo-register-express.image.repository=labs.etsi.org:5050/ocf/capif/mongo-express \
       --set mongo-register-express.image.tag=1.0.0-alpha.4 \
@@ -418,17 +418,17 @@ deploy_ocf_oficial_staging:
       --set mock-server.ingress.hosts[0].paths[0].pathType="Prefix" \
       --set mock-server.env.logLevel="DEBUG" \
       --set mongo.image.repository=labs.etsi.org:5050/ocf/capif/mongo \
-      --set mongo.image.tag=6.0.2 \      
+      --set mongo.image.tag=6.0.2 \
       --set mongo-register-express.enabled=true \
       --set mongo-register-express.image.repository=labs.etsi.org:5050/ocf/capif/mongo-express \
-      --set mongo-register-express.image.tag=1.0.0-alpha.4 \      
+      --set mongo-register-express.image.tag=1.0.0-alpha.4 \
       --set mongo-register-express.ingress.enabled=true \
       --set mongo-register-express.ingress.hosts[0].host="mongo-express-register-staging.$DOMAIN_STAGING" \
       --set mongo-register-express.ingress.hosts[0].paths[0].path="/" \
       --set mongo-register-express.ingress.hosts[0].paths[0].pathType="Prefix" \
       --set mongo-express.enabled=true \
       --set mongo-express.image.repository=labs.etsi.org:5050/ocf/capif/mongo-express \
-      --set mongo-express.image.tag=1.0.0-alpha.4 \      
+      --set mongo-express.image.tag=1.0.0-alpha.4 \
       --set mongo-express.ingress.enabled=true \
       --set mongo-express.ingress.hosts[0].host="mongo-express-staging.$DOMAIN_STAGING" \
       --set mongo-express.ingress.hosts[0].paths[0].path="/" \
@@ -611,17 +611,17 @@ deploy_ocf_dev:
       --set mock-server.ingress.hosts[0].paths[0].pathType="Prefix" \
       --set mock-server.env.logLevel="DEBUG" \
       --set mongo.image.repository=labs.etsi.org:5050/ocf/capif/mongo \
-      --set mongo.image.tag=6.0.2 \      
+      --set mongo.image.tag=6.0.2 \
       --set mongo-register-express.enabled=true \
       --set mongo-register-express.image.repository=labs.etsi.org:5050/ocf/capif/mongo-express \
-      --set mongo-register-express.image.tag=1.0.0-alpha.4 \      
+      --set mongo-register-express.image.tag=1.0.0-alpha.4 \
       --set mongo-register-express.ingress.enabled=true \
       --set mongo-register-express.ingress.hosts[0].host="mongo-express-register-$CI_ENV_ENDPOINT-dev.$DOMAIN_DEV" \
       --set mongo-register-express.ingress.hosts[0].paths[0].path="/" \
       --set mongo-register-express.ingress.hosts[0].paths[0].pathType="Prefix" \
       --set mongo-express.enabled=true \
       --set mongo-express.image.repository=labs.etsi.org:5050/ocf/capif/mongo-express \
-      --set mongo-express.image.tag=1.0.0-alpha.4 \      
+      --set mongo-express.image.tag=1.0.0-alpha.4 \
       --set mongo-express.ingress.enabled=true \
       --set mongo-express.ingress.hosts[0].host="mongo-express-$CI_ENV_ENDPOINT-dev.$DOMAIN_DEV" \
       --set mongo-express.ingress.hosts[0].paths[0].path="/" \
diff --git a/capif/templates/cicd-deploy-release.gitlab-ci.yml b/capif/templates/cicd-deploy-release.gitlab-ci.yml
index 5da314a52f2f89b88562af211a07eca730511772..86ab37293210f0bba6442465758f4461aea99b0d 100644
--- a/capif/templates/cicd-deploy-release.gitlab-ci.yml
+++ b/capif/templates/cicd-deploy-release.gitlab-ci.yml
@@ -252,17 +252,17 @@ deploy_ocf_prod:
       --set mock-server.ingress.hosts[0].paths[0].path="/" \
       --set mock-server.ingress.hosts[0].paths[0].pathType="Prefix" \
       --set mongo.image.repository=labs.etsi.org:5050/ocf/capif/mongo \
-      --set mongo.image.tag=6.0.2 \      
+      --set mongo.image.tag=6.0.2 \
       --set mongo-register-express.enabled=true \
       --set mongo-register-express.image.repository=labs.etsi.org:5050/ocf/capif/mongo-express \
-      --set mongo-register-express.image.tag=1.0.0-alpha.4 \      
+      --set mongo-register-express.image.tag=1.0.0-alpha.4 \
       --set mongo-register-express.ingress.enabled=true \
       --set mongo-register-express.ingress.hosts[0].host="mongo-express-register-prod.$DOMAIN_PROD" \
       --set mongo-register-express.ingress.hosts[0].paths[0].path="/" \
       --set mongo-register-express.ingress.hosts[0].paths[0].pathType="Prefix" \
       --set mongo-express.enabled=true \
       --set mongo-express.image.repository=labs.etsi.org:5050/ocf/capif/mongo-express \
-      --set mongo-express.image.tag=1.0.0-alpha.4 \      
+      --set mongo-express.image.tag=1.0.0-alpha.4 \
       --set mongo-express.ingress.enabled=true \
       --set mongo-express.ingress.hosts[0].host="mongo-express-prod.$DOMAIN_PROD" \
       --set mongo-express.ingress.hosts[0].paths[0].path="/" \